Disabled flaky SuggestAppDialog/FileManagerBrowserTest and PhishingCl…

…assifierDelegateTest.NoScorer. BUG=479757 TBR=hirono@chromium.org TBR=jam@chromium.org Review URL: https://codereview.chromium.org/1095403006 Cr-Commit-Position: refs/heads/master@{#326326}
Denger-Network · Apr 22, 2015 · 137c991 · 137c991
1 parent 3e75e59
commit 137c991
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
@@ -1040,8 +1040,9 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
                       TestParameter(NOT_IN_GUEST_MODE, "traverseDrive")));
 
 // Slow tests are disabled on debug build. http://crbug.com/327719
-// Disabled under MSAN as well. http://crbug.com/468980.
-#if !defined(NDEBUG) || defined(MEMORY_SANITIZER)
+// Disabled under MSAN, ASAN, and LSAN as well. http://crbug.com/479757.
+#if !defined(NDEBUG) || defined(MEMORY_SANITIZER) \
+    || defined(ADDRESS_SANITIZER) || defined(LEAK_SANITIZER)
 #define MAYBE_SuggestAppDialog DISABLED_SuggestAppDialog
 #else
 #define MAYBE_SuggestAppDialog SuggestAppDialog

diff --git a/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc b/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc
@@ -407,7 +407,14 @@ IN_PROC_BROWSER_TEST_F(PhishingClassifierDelegateTest, Navigation) {
   EXPECT_CALL(*classifier_, CancelPendingClassification());
 }
 
-IN_PROC_BROWSER_TEST_F(PhishingClassifierDelegateTest, NoScorer) {
+// Flaky: crbug.com/479757
+#if defined(LEAK_SANITIZER)
+#define MAYBE_NoScorer DISABLED_NoScorer
+#else
+#define MAYBE_NoScorer NoScorer
+#endif
+
+IN_PROC_BROWSER_TEST_F(PhishingClassifierDelegateTest, MAYBE_NoScorer) {
   // For this test, we'll create the delegate with no scorer available yet.
   ASSERT_FALSE(classifier_->is_ready());