Fix BlacklistManagerBrowserTest.Basic to be more solid.

It turns out it was flaky (was waiting for an event that already happened).
When running the message loop to wait for extension loading changes,
it was executing BlacklistManager tasks as well.

TEST=Covered by browser_tests.
BUG=21541
TBR=aa

Review URL: http://codereview.chromium.org/361003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30954 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 5 deletions

diff --git a/chrome/browser/privacy_blacklist/blacklist_manager_browsertest.cc b/chrome/browser/privacy_blacklist/blacklist_manager_browsertest.cc
index bbc30c4..d7a71e9 100644
--- a/chrome/browser/privacy_blacklist/blacklist_manager_browsertest.cc
+++ b/chrome/browser/privacy_blacklist/blacklist_manager_browsertest.cc
@@ -69,24 +69,32 @@ class BlacklistManagerBrowserTest : public ExtensionBrowserTest {
 };
 
 IN_PROC_BROWSER_TEST_F(BlacklistManagerBrowserTest, Basic) {
+  static const char kTestUrl[] = "http://host/annoying_ads/ad.jpg";
+
   InitializeBlacklistManager();
   ASSERT_TRUE(blacklist_manager_->GetCompiledBlacklist());
   EXPECT_FALSE(BlacklistHasMatch(blacklist_manager_->GetCompiledBlacklist(),
-                                 "http://host/annoying_ads/ad.jpg"));
+                                 kTestUrl));
 
   // Test loading an extension with blacklist.
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("common").AppendASCII("privacy_blacklist")));
-  WaitForBlacklistUpdate();
+  if (!BlacklistHasMatch(blacklist_manager_->GetCompiledBlacklist(),
+                         kTestUrl)) {
+    WaitForBlacklistUpdate();
+  }
   EXPECT_TRUE(BlacklistHasMatch(blacklist_manager_->GetCompiledBlacklist(),
-                                "http://host/annoying_ads/ad.jpg"));
+                                kTestUrl));
 
   // Make sure that after unloading the extension we update the blacklist.
   ExtensionsService* extensions_service =
       browser()->profile()->GetExtensionsService();
   ASSERT_EQ(1U, extensions_service->extensions()->size());
   UnloadExtension(extensions_service->extensions()->front()->id());
-  WaitForBlacklistUpdate();
+  if (BlacklistHasMatch(blacklist_manager_->GetCompiledBlacklist(),
+                        kTestUrl)) {
+    WaitForBlacklistUpdate();
+  }
   EXPECT_FALSE(BlacklistHasMatch(blacklist_manager_->GetCompiledBlacklist(),
-                                 "http://host/annoying_ads/ad.jpg"));
+                                 kTestUrl));
 }