Fix BlacklistManagerBrowserTest.Basic to be more solid.

chrome/browser/privacy_blacklist/blacklist_manager_browsertest.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/privacy_blacklist/blacklist_manager.h"
 
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/profile.h"
@@ skipping 51 matching lines @@
     registrar.Add(this,
                   NotificationType::BLACKLIST_MANAGER_BLACKLIST_READ_FINISHED,
                   Source<Profile>(browser()->profile()));
     ui_test_utils::RunMessageLoop();
   }
 
   scoped_refptr<BlacklistManager> blacklist_manager_;
 };
 
 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));
 }