Get rid of MessageLoop* caching in extensions code.

chrome/browser/extensions/extension_updater_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 <map>
 
 #include "base/file_util.h"
 #include "base/rand_util.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
@@ skipping 234 matching lines @@
 
     // Setup and start the updater.
     MessageLoop message_loop;
     ChromeThread io_thread(ChromeThread::IO);
     io_thread.Start();
 
     TestURLFetcherFactory factory;
     URLFetcher::set_factory(&factory);
     ScopedTempPrefService prefs;
     scoped_refptr<ExtensionUpdater> updater =
-      new ExtensionUpdater(&service, prefs.get(), 60*60*24, NULL, NULL);
+        new ExtensionUpdater(&service, prefs.get(), 60*60*24);
     updater->Start();
 
     // Tell the update that it's time to do update checks.
     SimulateTimerFired(updater.get());
 
     // Get the url our mock fetcher was asked to fetch.
     TestURLFetcher* fetcher =
         factory.GetFetcherByID(ExtensionUpdater::kManifestFetcherId);
     const GURL& url = fetcher->original_url();
     EXPECT_FALSE(url.is_empty());
@@ skipping 25 matching lines @@
 
     // Setup and start the updater.
     MessageLoop message_loop;
     ChromeThread io_thread(ChromeThread::IO);
     io_thread.Start();
 
     TestURLFetcherFactory factory;
     URLFetcher::set_factory(&factory);
     ScopedTempPrefService prefs;
     scoped_refptr<ExtensionUpdater> updater =
-      new ExtensionUpdater(&service, prefs.get(), 60*60*24, NULL, NULL);
+        new ExtensionUpdater(&service, prefs.get(), 60*60*24);
     updater->Start();
 
     // Tell the updater that it's time to do update checks.
     SimulateTimerFired(updater.get());
 
     // Get the url our mock fetcher was asked to fetch.
     TestURLFetcher* fetcher =
         factory.GetFetcherByID(ExtensionUpdater::kManifestFetcherId);
     const GURL& url = fetcher->original_url();
 
@@ skipping 22 matching lines @@
   static void TestDetermineUpdates() {
     // Create a set of test extensions
     ServiceForManifestTests service;
     ExtensionList tmp;
     CreateTestExtensions(3, &tmp, NULL);
     service.set_extensions(tmp);
 
     MessageLoop message_loop;
     ScopedTempPrefService prefs;
     scoped_refptr<ExtensionUpdater> updater =
-      new ExtensionUpdater(&service, prefs.get(), kUpdateFrequencySecs,
-                           NULL, NULL);
+        new ExtensionUpdater(&service, prefs.get(), kUpdateFrequencySecs);
 
     // Check passing an empty list of parse results to DetermineUpdates
     std::vector<UpdateManifest::Result> updates;
     std::vector<int> updateable = updater->DetermineUpdates(updates);
     EXPECT_TRUE(updateable.empty());
 
     // Create two updates - expect that DetermineUpdates will return the first
     // one (v1.0 installed, v1.1 available) but not the second one (both
     // installed and available at v2.0).
     scoped_ptr<Version> one(Version::GetVersionFromString("1.0"));
     EXPECT_TRUE(tmp[0]->version()->Equals(*one));
     AddParseResult(tmp[0]->id(),
         "1.1", "http://localhost/e1_1.1.crx", &updates);
     AddParseResult(tmp[1]->id(),
         tmp[1]->VersionString(), "http://localhost/e2_2.0.crx", &updates);
     updateable = updater->DetermineUpdates(updates);
     EXPECT_EQ(1u, updateable.size());
     EXPECT_EQ(0, updateable[0]);
     STLDeleteElements(&tmp);
   }
 
   static void TestMultipleManifestDownloading() {
     MessageLoop ui_loop;
+    ChromeThread ui_thread(ChromeThread::UI, &ui_loop);
     ChromeThread file_thread(ChromeThread::FILE);
     file_thread.Start();
     ChromeThread io_thread(ChromeThread::IO);
     io_thread.Start();
 
     TestURLFetcherFactory factory;
     TestURLFetcher* fetcher = NULL;
     URLFetcher::set_factory(&factory);
     ServiceForDownloadTests service;
     ScopedTempPrefService prefs;
     scoped_refptr<ExtensionUpdater> updater =
-      new ExtensionUpdater(&service, prefs.get(), kUpdateFrequencySecs,
-                           file_thread.message_loop(),
-                           io_thread.message_loop());
+        new ExtensionUpdater(&service, prefs.get(), kUpdateFrequencySecs);
 
     GURL url1("http://localhost/manifest1");
     GURL url2("http://localhost/manifest2");
 
     // Request 2 update checks - the first should begin immediately and the
     // second one should be queued up.
     updater->StartUpdateCheck(url1);
     updater->StartUpdateCheck(url2);
 
     std::string invalid_xml = "invalid xml";
@@ skipping 27 matching lines @@
     // kValidXml.
     file_thread.Stop();
     io_thread.Stop();
     ui_loop.RunAllPending();
     EXPECT_EQ("12345", service.last_inquired_extension_id());
     xmlCleanupGlobals();
   }
 
   static void TestSingleExtensionDownloading() {
     MessageLoop ui_loop;
+    ChromeThread ui_thread(ChromeThread::UI, &ui_loop);
     ChromeThread file_thread(ChromeThread::FILE);
     file_thread.Start();
     ChromeThread io_thread(ChromeThread::IO);
     io_thread.Start();
 
     TestURLFetcherFactory factory;
     TestURLFetcher* fetcher = NULL;
     URLFetcher::set_factory(&factory);
     ServiceForDownloadTests service;
     ScopedTempPrefService prefs;
     scoped_refptr<ExtensionUpdater> updater =
-      new ExtensionUpdater(&service, prefs.get(), kUpdateFrequencySecs,
-                           file_thread.message_loop(), NULL);
+        new ExtensionUpdater(&service, prefs.get(), kUpdateFrequencySecs);
 
     GURL test_url("http://localhost/extension.crx");
 
     std::string id = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
     std::string hash = "";
     std::string version = "0.0.1";
 
     updater->FetchUpdatedExtension(id, test_url, hash, version);
 
     // Call back the ExtensionUpdater with a 200 response and some test data
@@ skipping 16 matching lines @@
     std::string file_contents;
     EXPECT_TRUE(file_util::ReadFileToString(tmpfile_path, &file_contents));
     EXPECT_TRUE(extension_data == file_contents);
 
     file_util::Delete(tmpfile_path, false);
     URLFetcher::set_factory(NULL);
   }
 
   static void TestBlacklistDownloading() {
     MessageLoop message_loop;
+    ChromeThread ui_thread(ChromeThread::UI, &message_loop);
     ChromeThread io_thread(ChromeThread::IO);
     io_thread.Start();
 
     TestURLFetcherFactory factory;
     TestURLFetcher* fetcher = NULL;
     URLFetcher::set_factory(&factory);
     ServiceForBlacklistTests service;
     ScopedTempPrefService prefs;
     scoped_refptr<ExtensionUpdater> updater =
-      new ExtensionUpdater(&service, prefs.get(), kUpdateFrequencySecs,
-                           NULL, NULL);
+        new ExtensionUpdater(&service, prefs.get(), kUpdateFrequencySecs);
     prefs.get()->
       RegisterStringPref(prefs::kExtensionBlacklistUpdateVersion, L"0");
     GURL test_url("http://localhost/extension.crx");
 
     std::string id = "com.google.crx.blacklist";
 
     std::string hash =
       "2CE109E9D0FAF820B2434E166297934E6177B65AB9951DBC3E204CAD4689B39C";
 
     std::string version = "0.0.1";
@@ skipping 16 matching lines @@
     EXPECT_TRUE(service.processed_blacklist());
 
     EXPECT_EQ(version, WideToASCII(prefs.get()->
       GetString(prefs::kExtensionBlacklistUpdateVersion)));
 
     URLFetcher::set_factory(NULL);
   }
 
   static void TestMultipleExtensionDownloading() {
     MessageLoopForUI message_loop;
+    ChromeThread ui_thread(ChromeThread::UI, &message_loop);
+    ChromeThread file_thread(ChromeThread::FILE, &message_loop);
     ChromeThread io_thread(ChromeThread::IO);
     io_thread.Start();
 
     TestURLFetcherFactory factory;
     TestURLFetcher* fetcher = NULL;
     URLFetcher::set_factory(&factory);
     ServiceForDownloadTests service;
     ScopedTempPrefService prefs;
     scoped_refptr<ExtensionUpdater> updater =
-      new ExtensionUpdater(&service, prefs.get(), kUpdateFrequencySecs,
-                           &message_loop, NULL);
+        new ExtensionUpdater(&service, prefs.get(), kUpdateFrequencySecs);
 
     GURL url1("http://localhost/extension1.crx");
     GURL url2("http://localhost/extension2.crx");
 
     std::string id1 = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
     std::string id2 = "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb";
 
     std::string hash1 = "";
     std::string hash2 = "";
 
@@ skipping 81 matching lines @@
 // -prodversionmin (shouldn't update if browser version too old)
 // -manifests & updates arriving out of order / interleaved
 // -Profile::GetDefaultRequestContext() returning null
 //  (should not crash, but just do check later)
 // -malformed update url (empty, file://, has query, has a # fragment, etc.)
 // -An extension gets uninstalled while updates are in progress (so it doesn't
 //  "come back from the dead")
 // -An extension gets manually updated to v3 while we're downloading v2 (ie
 //  you don't get downgraded accidentally)
 // -An update manifest mentions multiple updates