Simplify threading in browser thread by making only ChromeThread deal with di...

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"
 #include "base/thread.h"
+#include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/extensions/extension_updater.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/net/test_url_fetcher_factory.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_error_reporter.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
@@ skipping 205 matching lines @@
 
   static void TestExtensionUpdateCheckRequests() {
     // Create an extension with an update_url.
     ServiceForManifestTests service;
     ExtensionList tmp;
     std::string update_url("http://foo.com/bar");
     CreateTestExtensions(1, &tmp, &update_url);
     service.set_extensions(tmp);
 
     // Setup and start the updater.
+    MessageLoop message_loop;
+    ChromeThread io_thread(ChromeThread::IO);
+    io_thread.Start();
+
     TestURLFetcherFactory factory;
     URLFetcher::set_factory(&factory);
-    MessageLoop message_loop;
     ScopedTempPrefService prefs;
     scoped_refptr<ExtensionUpdater> updater =
       new ExtensionUpdater(&service, prefs.get(), 60*60*24, NULL, NULL);
     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 =
@@ skipping 20 matching lines @@
     EXPECT_EQ(tmp[0]->VersionString(), params["v"]);
     EXPECT_EQ("", params["uc"]);
 
     STLDeleteElements(&tmp);
   }
 
   static void TestBlacklistUpdateCheckRequests() {
     ServiceForManifestTests service;
 
     // Setup and start the updater.
+    MessageLoop message_loop;
+    ChromeThread io_thread(ChromeThread::IO);
+    io_thread.Start();
+
     TestURLFetcherFactory factory;
     URLFetcher::set_factory(&factory);
-    MessageLoop message_loop;
     ScopedTempPrefService prefs;
     scoped_refptr<ExtensionUpdater> updater =
       new ExtensionUpdater(&service, prefs.get(), 60*60*24, NULL, NULL);
     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 =
@@ skipping 49 matching lines @@
         "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 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;
-    MessageLoop ui_loop;
-    base::Thread file_thread("File Thread");
-    ASSERT_TRUE(file_thread.Start());
-    base::Thread io_thread("IO Thread");
-    ASSERT_TRUE(io_thread.Start());
     ScopedTempPrefService prefs;
     scoped_refptr<ExtensionUpdater> updater =
       new ExtensionUpdater(&service, prefs.get(), kUpdateFrequencySecs,
                            file_thread.message_loop(),
                            io_thread.message_loop());
 
     GURL url1("http://localhost/manifest1");
     GURL url2("http://localhost/manifest2");
 
     // Request 2 update checks - the first should begin immediately and the
@@ skipping 32 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;
-    base::Thread file_thread("File Thread");
-    ASSERT_TRUE(file_thread.Start());
+    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);
 
@@ skipping 25 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 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);
     prefs.get()->
       RegisterStringPref(prefs::kExtensionBlacklistUpdateVersion, L"0");
@@ skipping 24 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 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);
 
     GURL url1("http://localhost/extension1.crx");
@@ skipping 87 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