Fix race conditions where an object's constructor uses PostTask on itself. T...

chrome/browser/privacy_blacklist/blacklist_manager_unittest.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 "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/thread.h"
@@ skipping 131 matching lines @@
   Blacklist::Match* match = blacklist->findMatch(GURL(url));
 
   if (!match)
     return false;
 
   delete match;
   return true;
 }
 
 TEST_F(BlacklistManagerTest, Basic) {
-  scoped_refptr<BlacklistManager> manager(
-      new BlacklistManager(&profile_, &path_provider_));
+  scoped_refptr<BlacklistManager> manager(new BlacklistManager());
+  manager->Initialize(&profile_, &path_provider_);
   WaitForBlacklistUpdate();
 
   const Blacklist* blacklist = manager->GetCompiledBlacklist();
   EXPECT_TRUE(blacklist);
 
   // Repeated invocations of GetCompiledBlacklist should return the same object.
   EXPECT_EQ(blacklist, manager->GetCompiledBlacklist());
 }
 
 TEST_F(BlacklistManagerTest, BlacklistPathProvider) {
-  scoped_refptr<BlacklistManager> manager(
-      new BlacklistManager(&profile_, &path_provider_));
+  scoped_refptr<BlacklistManager> manager(new BlacklistManager());
+  manager->Initialize(&profile_, &path_provider_);
   WaitForBlacklistUpdate();
 
   const Blacklist* blacklist1 = manager->GetCompiledBlacklist();
   EXPECT_FALSE(BlacklistHasMatch(blacklist1,
                                  "http://host/annoying_ads/ad.jpg"));
 
   path_provider_.AddPersistentPath(
       test_data_dir_.AppendASCII("annoying_ads.pbl"));
   WaitForBlacklistUpdate();
 
@@ skipping 13 matching lines @@
   // not checking for inequality.
   EXPECT_TRUE(BlacklistHasMatch(blacklist3, "http://host/annoying_ads/ad.jpg"));
   EXPECT_TRUE(BlacklistHasMatch(blacklist3, "http://host/other_ads/ad.jpg"));
 
   // Now make sure that transient blacklists don't survive after re-creating
   // the BlacklistManager.
   manager = NULL;
   path_provider_.clear();
   path_provider_.AddPersistentPath(
       test_data_dir_.AppendASCII("annoying_ads.pbl"));
-  manager = new BlacklistManager(&profile_, &path_provider_);
+  manager = new BlacklistManager();
+  manager->Initialize(&profile_, &path_provider_);
   WaitForBlacklistUpdate();
 
   const Blacklist* blacklist4 = manager->GetCompiledBlacklist();
 
   EXPECT_TRUE(BlacklistHasMatch(blacklist4, "http://host/annoying_ads/ad.jpg"));
   EXPECT_FALSE(BlacklistHasMatch(blacklist4, "http://host/other_ads/ad.jpg"));
 }
 
 TEST_F(BlacklistManagerTest, BlacklistPathReadError) {
-  scoped_refptr<BlacklistManager> manager(
-      new BlacklistManager(&profile_, &path_provider_));
+  scoped_refptr<BlacklistManager> manager(new BlacklistManager());
+  manager->Initialize(&profile_, &path_provider_);
   WaitForBlacklistUpdate();
 
   FilePath bogus_path(test_data_dir_.AppendASCII("does_not_exist_randomness"));
   ASSERT_FALSE(file_util::PathExists(bogus_path));
   path_provider_.AddPersistentPath(bogus_path);
   WaitForBlacklistError();
 
   const Blacklist* blacklist = manager->GetCompiledBlacklist();
   EXPECT_TRUE(blacklist);
 }
 
 TEST_F(BlacklistManagerTest, CompiledBlacklistReadError) {
   FilePath compiled_blacklist_path;
 
   {
-    scoped_refptr<BlacklistManager> manager(
-        new BlacklistManager(&profile_, &path_provider_));
+    scoped_refptr<BlacklistManager> manager(new BlacklistManager());
+    manager->Initialize(&profile_, &path_provider_);
     WaitForBlacklistUpdate();
 
     path_provider_.AddPersistentPath(
         test_data_dir_.AppendASCII("annoying_ads.pbl"));
     WaitForBlacklistUpdate();
     const Blacklist* blacklist = manager->GetCompiledBlacklist();
     EXPECT_TRUE(BlacklistHasMatch(blacklist,
                                   "http://host/annoying_ads/ad.jpg"));
 
     compiled_blacklist_path = manager->compiled_blacklist_path();
   }
 
   ASSERT_TRUE(file_util::PathExists(compiled_blacklist_path));
   ASSERT_TRUE(file_util::Delete(compiled_blacklist_path, false));
 
   {
-    scoped_refptr<BlacklistManager> manager(
-        new BlacklistManager(&profile_, &path_provider_));
+    scoped_refptr<BlacklistManager> manager(new BlacklistManager());
+    manager->Initialize(&profile_, &path_provider_);
     WaitForBlacklistUpdate();
 
     // The manager should recompile the blacklist.
     const Blacklist* blacklist = manager->GetCompiledBlacklist();
     EXPECT_TRUE(BlacklistHasMatch(blacklist,
                                   "http://host/annoying_ads/ad.jpg"));
   }
 }
 
 }  // namespace