Moved JsonPrefStore to use SequencedWorkerPool

chrome/browser/extensions/updater/extension_updater_unittest.cc

 // Copyright (c) 2012 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 <list>
 #include <map>
 #include <set>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 144 matching lines @@
   std::set<std::string> updated_;
 
   DISALLOW_COPY_AND_ASSIGN(NotificationsObserver);
 };
 
 }  // namespace
 
 // Base class for further specialized test classes.
 class MockService : public TestExtensionService {
  public:
-  MockService()
-      : pending_extension_manager_(ALLOW_THIS_IN_INITIALIZER_LIST(*this)) {
+  explicit MockService(TestExtensionPrefs* prefs)
+      : prefs_(prefs),
+        pending_extension_manager_(ALLOW_THIS_IN_INITIALIZER_LIST(*this)) {
     profile_.CreateRequestContext();
   }
+
   virtual ~MockService() {}
 
   virtual PendingExtensionManager* pending_extension_manager() OVERRIDE {
     ADD_FAILURE() << "Subclass should override this if it will "
                   << "be accessed by a test.";
     return &pending_extension_manager_;
   }
 
   Profile* profile() { return &profile_; }
 
   net::URLRequestContextGetter* request_context() {
     return profile_.GetRequestContext();
   }
 
-  ExtensionPrefs* extension_prefs() { return prefs_.prefs(); }
+  ExtensionPrefs* extension_prefs() { return prefs_->prefs(); }
 
-  PrefService* pref_service() { return prefs_.pref_service(); }
+  PrefService* pref_service() { return prefs_->pref_service(); }
 
   // Creates test extensions and inserts them into list. The name and
   // version are all based on their index. If |update_url| is non-null, it
   // will be used as the update_url for each extension.
   // The |id| is used to distinguish extension names and make sure that
   // no two extensions share the same name.
   void CreateTestExtensions(int id, int count, ExtensionList *list,
                             const std::string* update_url,
                             Extension::Location location) {
     for (int i = 1; i <= count; i++) {
       DictionaryValue manifest;
       manifest.SetString(extension_manifest_keys::kVersion,
                          base::StringPrintf("%d.0.0.0", i));
       manifest.SetString(extension_manifest_keys::kName,
                          base::StringPrintf("Extension %d.%d", id, i));
       if (update_url)
         manifest.SetString(extension_manifest_keys::kUpdateURL, *update_url);
       scoped_refptr<Extension> e =
-          prefs_.AddExtensionWithManifest(manifest, location);
+          prefs_->AddExtensionWithManifest(manifest, location);
       ASSERT_TRUE(e != NULL);
       list->push_back(e);
     }
   }
 
  protected:
+  TestExtensionPrefs* const prefs_;
   PendingExtensionManager pending_extension_manager_;
-  TestExtensionPrefs prefs_;
   TestingProfile profile_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockService);
 };
 
 
 std::string GenerateId(std::string input) {
   std::string result;
   EXPECT_TRUE(Extension::GenerateId(input, &result));
@@ skipping 30 matching lines @@
                              Version(),
                              should_allow_install,
                              kIsFromSync,
                              kInstallSilently,
                              Extension::INTERNAL));
   }
 }
 
 class ServiceForManifestTests : public MockService {
  public:
-  ServiceForManifestTests() {}
+  explicit ServiceForManifestTests(TestExtensionPrefs* prefs)
+      : MockService(prefs) {
+  }
 
   virtual ~ServiceForManifestTests() {}
 
   virtual const Extension* GetExtensionById(
       const std::string& id, bool include_disabled) const OVERRIDE {
     const Extension* result = extensions_.GetByID(id);
     if (result || !include_disabled)
       return result;
     return disabled_extensions_.GetByID(id);
   }
@@ skipping 24 matching lines @@
     }
   }
 
  private:
   ExtensionSet extensions_;
   ExtensionSet disabled_extensions_;
 };
 
 class ServiceForDownloadTests : public MockService {
  public:
-  ServiceForDownloadTests()
-      : MockService() {
+  explicit ServiceForDownloadTests(TestExtensionPrefs* prefs)
+      : MockService(prefs) {
   }
 
   // Add a fake crx installer to be returned by a call to UpdateExtension()
   // with a specific ID.  Caller keeps ownership of |crx_installer|.
   void AddFakeCrxInstaller(const std::string& id, CrxInstaller* crx_installer) {
     fake_crx_installers_[id] = crx_installer;
   }
 
   bool UpdateExtension(
       const std::string& id,
@@ skipping 42 matching lines @@
 
   // The last extension ID that GetExtensionById was called with.
   // Mutable because the method that sets it (GetExtensionById) is const
   // in the actual extension service, but must record the last extension
   // ID in this test class.
   mutable std::string last_inquired_extension_id_;
 };
 
 class ServiceForBlacklistTests : public MockService {
  public:
-  ServiceForBlacklistTests()
-     : MockService(),
+  explicit ServiceForBlacklistTests(TestExtensionPrefs* prefs)
+     : MockService(prefs),
        processed_blacklist_(false) {
   }
   virtual void UpdateExtensionBlacklist(
     const std::vector<std::string>& blacklist) OVERRIDE {
     processed_blacklist_ = true;
     return;
   }
   bool processed_blacklist() { return processed_blacklist_; }
   const std::string& extension_id() { return extension_id_; }
 
@@ skipping 26 matching lines @@
   }
 }
 
 // All of our tests that need to use private APIs of ExtensionUpdater live
 // inside this class (which is a friend to ExtensionUpdater).
 class ExtensionUpdaterTest : public testing::Test {
  public:
   ExtensionUpdaterTest()
       : ui_thread_(BrowserThread::UI, &loop_),
         file_thread_(BrowserThread::FILE, &loop_),
-        io_thread_(BrowserThread::IO, &loop_) {}
+        io_thread_(BrowserThread::IO, &loop_) {
+  }
+
+  virtual ~ExtensionUpdaterTest() {
+  }
+
+  virtual void SetUp() OVERRIDE {
+    prefs_.reset(new TestExtensionPrefs(loop_.message_loop_proxy()));
+  }
 
   virtual void TearDown() OVERRIDE {
     // Some tests create URLRequestContextGetters, whose destruction must run
     // on the IO thread. Make sure the IO loop spins before shutdown so that
     // those objects are released.
-    loop_.RunAllPending();
+    RunUntilIdle();
+    prefs_.reset();
   }
 
-  void RunAllPending() {
-    loop_.RunAllPending();
+  void RunUntilIdle() {
+    prefs_->pref_service()->CommitPendingWrite();
+    loop_.RunUntilIdle();
   }
 
   void SimulateTimerFired(ExtensionUpdater* updater) {
     EXPECT_TRUE(updater->timer_.IsRunning());
     updater->timer_.Stop();
     updater->TimerFired();
   }
 
   // Adds a Result with the given data to results.
   void AddParseResult(const std::string& id,
@@ skipping 18 matching lines @@
     downloader->StartUpdateCheck(fetch_data);
   }
 
   size_t ManifestFetchersCount(ExtensionDownloader* downloader) {
     return downloader->manifests_pending_.size() +
            (downloader->manifest_fetcher_.get() ? 1 : 0);
   }
 
   void TestExtensionUpdateCheckRequests(bool pending) {
     // Create an extension with an update_url.
-    ServiceForManifestTests service;
+    ServiceForManifestTests service(prefs_.get());
     std::string update_url("http://foo.com/bar");
     ExtensionList extensions;
     PendingExtensionManager* pending_extension_manager =
         service.pending_extension_manager();
     if (pending) {
       SetupPendingExtensionManagerForTest(1, GURL(update_url),
                                           pending_extension_manager);
     } else {
       service.CreateTestExtensions(1, 1, &extensions, &update_url,
                                    Extension::INTERNAL);
@@ skipping 39 matching lines @@
       EXPECT_EQ("0.0.0.0", params["v"]);
     } else {
       EXPECT_EQ(extensions[0]->id(), params["id"]);
       EXPECT_EQ(extensions[0]->VersionString(), params["v"]);
     }
     EXPECT_EQ("", params["uc"]);
   }
 
   void TestBlacklistUpdateCheckRequests() {
     // Setup and start the updater.
-    ServiceForManifestTests service;
+    ServiceForManifestTests service(prefs_.get());
 
     net::TestURLFetcherFactory factory;
     ExtensionUpdater updater(
         &service, service.extension_prefs(), service.pref_service(),
         service.profile(), 60*60*24);
     updater.Start();
 
     // Tell the updater that it's time to do update checks.
     SimulateTimerFired(&updater);
 
@@ skipping 61 matching lines @@
     ManifestFetchData fetch_data(GURL("http://localhost/foo"));
     fetch_data.AddExtension(id, version, &kNeverPingedData, "a=1&b=2&c", "");
     EXPECT_EQ("http://localhost/foo\?x=id%3Daaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
               "%26v%3D1.0%26uc%26ap%3Da%253D1%2526b%253D2%2526c",
               fetch_data.full_url().spec());
   }
 
   void TestUpdateUrlDataFromGallery(const std::string& gallery_url) {
     net::TestURLFetcherFactory factory;
 
-    MockService service;
+    MockService service(prefs_.get());
     MockExtensionDownloaderDelegate delegate;
     ExtensionDownloader downloader(&delegate, service.request_context());
     ExtensionList extensions;
     std::string url(gallery_url);
 
     service.CreateTestExtensions(1, 1, &extensions, &url, Extension::INTERNAL);
 
     const std::string& id = extensions[0]->id();
     EXPECT_CALL(delegate, GetPingDataForExtension(id, _));
 
@@ skipping 60 matching lines @@
         .WillOnce(DoAll(SetArgPointee<1>("2.0.0.0"),
                         Return(true)));
 
     downloader.DetermineUpdates(fetch_data, updates, &updateable);
     EXPECT_EQ(1u, updateable.size());
     EXPECT_EQ(0, updateable[0]);
   }
 
   void TestDetermineUpdatesPending() {
     // Create a set of test extensions
-    ServiceForManifestTests service;
+    ServiceForManifestTests service(prefs_.get());
     PendingExtensionManager* pending_extension_manager =
         service.pending_extension_manager();
     SetupPendingExtensionManagerForTest(3, GURL(), pending_extension_manager);
 
     TestingProfile profile;
     profile.CreateRequestContext();
     MockExtensionDownloaderDelegate delegate;
     ExtensionDownloader downloader(&delegate, profile.GetRequestContext());
 
     ManifestFetchData fetch_data(GURL("http://localhost/foo"));
@@ skipping 21 matching lines @@
     EXPECT_EQ(3u, updateable.size());
     for (std::vector<int>::size_type i = 0; i < updateable.size(); ++i) {
       EXPECT_EQ(static_cast<int>(i), updateable[i]);
     }
   }
 
   void TestMultipleManifestDownloading() {
     net::TestURLFetcherFactory factory;
     net::TestURLFetcher* fetcher = NULL;
     NotificationsObserver observer;
-    MockService service;
+    MockService service(prefs_.get());
     MockExtensionDownloaderDelegate delegate;
     ExtensionDownloader downloader(&delegate, service.request_context());
 
     GURL kUpdateUrl("http://localhost/manifest1");
 
     ManifestFetchData* fetch1 = new ManifestFetchData(kUpdateUrl);
     ManifestFetchData* fetch2 = new ManifestFetchData(kUpdateUrl);
     ManifestFetchData* fetch3 = new ManifestFetchData(kUpdateUrl);
     ManifestFetchData* fetch4 = new ManifestFetchData(kUpdateUrl);
     ManifestFetchData::PingData zeroDays(0, 0);
     fetch1->AddExtension("1111", "1.0", &zeroDays, kEmptyUpdateUrlData, "");
     fetch2->AddExtension("2222", "2.0", &zeroDays, kEmptyUpdateUrlData, "");
     fetch3->AddExtension("3333", "3.0", &zeroDays, kEmptyUpdateUrlData, "");
     fetch4->AddExtension("4444", "4.0", &zeroDays, kEmptyUpdateUrlData, "");
 
     // This will start the first fetcher and queue the others. The next in queue
     // is started as each fetcher receives its response.
     downloader.StartUpdateCheck(fetch1);
     downloader.StartUpdateCheck(fetch2);
     downloader.StartUpdateCheck(fetch3);
     downloader.StartUpdateCheck(fetch4);
-    RunAllPending();
+    RunUntilIdle();
 
     // The first fetch will fail.
     fetcher = factory.GetFetcherByID(ExtensionDownloader::kManifestFetcherId);
     EXPECT_TRUE(fetcher != NULL && fetcher->delegate() != NULL);
     EXPECT_TRUE(fetcher->GetLoadFlags() == kExpectedLoadFlags);
     EXPECT_CALL(delegate, OnExtensionDownloadFailed(
         "1111", ExtensionDownloaderDelegate::MANIFEST_FETCH_FAILED, _));
     fetcher->set_url(kUpdateUrl);
     fetcher->set_status(net::URLRequestStatus());
     fetcher->set_response_code(400);
     fetcher->delegate()->OnURLFetchComplete(fetcher);
-    RunAllPending();
+    RunUntilIdle();
     Mock::VerifyAndClearExpectations(&delegate);
 
     // The second fetch gets invalid data.
     const std::string kInvalidXml = "invalid xml";
     fetcher = factory.GetFetcherByID(ExtensionDownloader::kManifestFetcherId);
     EXPECT_TRUE(fetcher != NULL && fetcher->delegate() != NULL);
     EXPECT_TRUE(fetcher->GetLoadFlags() == kExpectedLoadFlags);
     EXPECT_CALL(delegate, OnExtensionDownloadFailed(
         "2222", ExtensionDownloaderDelegate::MANIFEST_INVALID, _));
     fetcher->set_url(kUpdateUrl);
     fetcher->set_status(net::URLRequestStatus());
     fetcher->set_response_code(200);
     fetcher->SetResponseString(kInvalidXml);
     fetcher->delegate()->OnURLFetchComplete(fetcher);
-    RunAllPending();
+    RunUntilIdle();
     Mock::VerifyAndClearExpectations(&delegate);
 
     // The third fetcher doesn't have an update available.
     const std::string kNoUpdate =
         "<?xml version='1.0' encoding='UTF-8'?>"
         "<gupdate xmlns='http://www.google.com/update2/response'"
         "                protocol='2.0'>"
         " <app appid='3333'>"
         "  <updatecheck codebase='http://example.com/extension_3.0.0.0.crx'"
         "               version='3.0.0.0' prodversionmin='3.0.0.0' />"
         " </app>"
         "</gupdate>";
     fetcher = factory.GetFetcherByID(ExtensionDownloader::kManifestFetcherId);
     EXPECT_TRUE(fetcher != NULL && fetcher->delegate() != NULL);
     EXPECT_TRUE(fetcher->GetLoadFlags() == kExpectedLoadFlags);
     EXPECT_CALL(delegate, IsExtensionPending("3333")).WillOnce(Return(false));
     EXPECT_CALL(delegate, GetExtensionExistingVersion("3333", _))
         .WillOnce(DoAll(SetArgPointee<1>("3.0.0.0"),
                         Return(true)));
     EXPECT_CALL(delegate, OnExtensionDownloadFailed(
         "3333", ExtensionDownloaderDelegate::NO_UPDATE_AVAILABLE, _));
     fetcher->set_url(kUpdateUrl);
     fetcher->set_status(net::URLRequestStatus());
     fetcher->set_response_code(200);
     fetcher->SetResponseString(kNoUpdate);
     fetcher->delegate()->OnURLFetchComplete(fetcher);
-    RunAllPending();
+    RunUntilIdle();
     Mock::VerifyAndClearExpectations(&delegate);
 
     // The last fetcher has an update.
     const std::string kUpdateAvailable =
         "<?xml version='1.0' encoding='UTF-8'?>"
         "<gupdate xmlns='http://www.google.com/update2/response'"
         "                protocol='2.0'>"
         " <app appid='4444'>"
         "  <updatecheck codebase='http://example.com/extension_1.2.3.4.crx'"
         "               version='4.0.42.0' prodversionmin='4.0.42.0' />"
         " </app>"
         "</gupdate>";
     fetcher = factory.GetFetcherByID(ExtensionDownloader::kManifestFetcherId);
     EXPECT_TRUE(fetcher != NULL && fetcher->delegate() != NULL);
     EXPECT_TRUE(fetcher->GetLoadFlags() == kExpectedLoadFlags);
     EXPECT_CALL(delegate, IsExtensionPending("4444")).WillOnce(Return(false));
     EXPECT_CALL(delegate, GetExtensionExistingVersion("4444", _))
         .WillOnce(DoAll(SetArgPointee<1>("4.0.0.0"),
                         Return(true)));
     fetcher->set_url(kUpdateUrl);
     fetcher->set_status(net::URLRequestStatus());
     fetcher->set_response_code(200);
     fetcher->SetResponseString(kUpdateAvailable);
     fetcher->delegate()->OnURLFetchComplete(fetcher);
-    RunAllPending();
+    RunUntilIdle();
     Mock::VerifyAndClearExpectations(&delegate);
 
     // Verify that the downloader decided to update this extension.
     EXPECT_EQ(1u, observer.UpdatedCount());
     EXPECT_TRUE(observer.Updated("4444"));
   }
 
   void TestSingleExtensionDownloading(bool pending) {
     net::TestURLFetcherFactory factory;
     net::TestURLFetcher* fetcher = NULL;
-    scoped_ptr<ServiceForDownloadTests> service(new ServiceForDownloadTests);
+    scoped_ptr<ServiceForDownloadTests> service(
+        new ServiceForDownloadTests(prefs_.get()));
     ExtensionUpdater updater(service.get(), service->extension_prefs(),
                              service->pref_service(),
                              service->profile(),
                              kUpdateFrequencySecs);
     updater.Start();
     ResetDownloader(
         &updater,
         new ExtensionDownloader(&updater, service->request_context()));
 
     GURL test_url("http://localhost/extension.crx");
@@ skipping 21 matching lines @@
     fetcher = factory.GetFetcherByID(ExtensionDownloader::kExtensionFetcherId);
     EXPECT_TRUE(fetcher != NULL && fetcher->delegate() != NULL);
     EXPECT_TRUE(fetcher->GetLoadFlags() == kExpectedLoadFlags);
 
     fetcher->set_url(test_url);
     fetcher->set_status(net::URLRequestStatus());
     fetcher->set_response_code(200);
     fetcher->SetResponseFilePath(extension_file_path);
     fetcher->delegate()->OnURLFetchComplete(fetcher);
 
-    RunAllPending();
+    RunUntilIdle();
 
     // Expect that ExtensionUpdater asked the mock extensions service to install
     // a file with the test data for the right id.
     EXPECT_EQ(id, service->extension_id());
     FilePath tmpfile_path = service->install_path();
     EXPECT_FALSE(tmpfile_path.empty());
     EXPECT_EQ(test_url, service->download_url());
     EXPECT_EQ(extension_file_path, tmpfile_path);
   }
 
   void TestBlacklistDownloading() {
     net::TestURLFetcherFactory factory;
     net::TestURLFetcher* fetcher = NULL;
-    ServiceForBlacklistTests service;
+    ServiceForBlacklistTests service(prefs_.get());
     ExtensionUpdater updater(
         &service, service.extension_prefs(), service.pref_service(),
         service.profile(), kUpdateFrequencySecs);
     updater.Start();
     ResetDownloader(
         &updater,
         new ExtensionDownloader(&updater, service.request_context()));
     GURL test_url("http://localhost/extension.crx");
 
     std::string id = "com.google.crx.blacklist";
@@ skipping 10 matching lines @@
     fetcher = factory.GetFetcherByID(ExtensionDownloader::kExtensionFetcherId);
     EXPECT_TRUE(fetcher != NULL && fetcher->delegate() != NULL);
     EXPECT_TRUE(fetcher->GetLoadFlags() == kExpectedLoadFlags);
 
     fetcher->set_url(test_url);
     fetcher->set_status(net::URLRequestStatus());
     fetcher->set_response_code(200);
     fetcher->SetResponseString(extension_data);
     fetcher->delegate()->OnURLFetchComplete(fetcher);
 
-    RunAllPending();
+    RunUntilIdle();
 
     // The updater should have called extension service to process the
     // blacklist.
     EXPECT_TRUE(service.processed_blacklist());
 
     EXPECT_EQ(version, service.pref_service()->
       GetString(prefs::kExtensionBlacklistUpdateVersion));
   }
 
   // Two extensions are updated.  If |updates_start_running| is true, the
   // mock extensions service has UpdateExtension(...) return true, and
   // the test is responsible for creating fake CrxInstallers.  Otherwise,
   // UpdateExtension() returns false, signaling install failures.
   void TestMultipleExtensionDownloading(bool updates_start_running) {
     net::TestURLFetcherFactory factory;
     net::TestURLFetcher* fetcher = NULL;
-    ServiceForDownloadTests service;
+    ServiceForDownloadTests service(prefs_.get());
     ExtensionUpdater updater(
         &service, service.extension_prefs(), service.pref_service(),
         service.profile(), kUpdateFrequencySecs);
     updater.Start();
     ResetDownloader(
         &updater,
         new ExtensionDownloader(&updater, service.request_context()));
 
     EXPECT_FALSE(updater.crx_install_is_running_);
 
@@ skipping 49 matching lines @@
       // If we don't add fake CRX installers, the mock service fakes a failure
       // starting the install.
     }
 
     fetcher->set_url(url1);
     fetcher->set_status(net::URLRequestStatus());
     fetcher->set_response_code(200);
     fetcher->SetResponseFilePath(extension_file_path);
     fetcher->delegate()->OnURLFetchComplete(fetcher);
 
-    RunAllPending();
+    RunUntilIdle();
 
     // Expect that the service was asked to do an install with the right data.
     FilePath tmpfile_path = service.install_path();
     EXPECT_FALSE(tmpfile_path.empty());
     EXPECT_EQ(id1, service.extension_id());
     EXPECT_EQ(url1, service.download_url());
-    RunAllPending();
+    RunUntilIdle();
 
     // Make sure the second fetch finished and asked the service to do an
     // update.
     FilePath extension_file_path2(FILE_PATH_LITERAL("/whatever2"));
     fetcher = factory.GetFetcherByID(ExtensionDownloader::kExtensionFetcherId);
     EXPECT_TRUE(fetcher != NULL && fetcher->delegate() != NULL);
     EXPECT_TRUE(fetcher->GetLoadFlags() == kExpectedLoadFlags);
 
     fetcher->set_url(url2);
     fetcher->set_status(net::URLRequestStatus());
     fetcher->set_response_code(200);
     fetcher->SetResponseFilePath(extension_file_path2);
     fetcher->delegate()->OnURLFetchComplete(fetcher);
-    RunAllPending();
+    RunUntilIdle();
 
     if (updates_start_running) {
       EXPECT_TRUE(updater.crx_install_is_running_);
 
       // The second install should not have run, because the first has not
       // sent a notification that it finished.
       EXPECT_EQ(id1, service.extension_id());
       EXPECT_EQ(url1, service.download_url());
 
       // Fake install notice.  This should start the second installation,
@@ skipping 57 matching lines @@
   // on the delta between now and the last ping time (or in the case of active
   // pings, that delta plus whether the app has been active).
   void TestGalleryRequests(int rollcall_ping_days,
                            int active_ping_days,
                            bool active_bit,
                            bool expect_brand_code) {
     net::TestURLFetcherFactory factory;
 
     // Set up 2 mock extensions, one with a google.com update url and one
     // without.
-    ServiceForManifestTests service;
+    prefs_.reset(new TestExtensionPrefs(loop_.message_loop_proxy()));
+    ServiceForManifestTests service(prefs_.get());
     ExtensionList tmp;
     GURL url1("http://clients2.google.com/service/update2/crx");
     GURL url2("http://www.somewebsite.com");
     service.CreateTestExtensions(1, 1, &tmp, &url1.possibly_invalid_spec(),
                                  Extension::INTERNAL);
     service.CreateTestExtensions(2, 1, &tmp, &url2.possibly_invalid_spec(),
                                  Extension::INTERNAL);
     EXPECT_EQ(2u, tmp.size());
     service.set_extensions(tmp);
 
@@ skipping 91 matching lines @@
     if (expect_brand_code) {
       EXPECT_TRUE(url1_query.find(brand_string) != std::string::npos);
     } else {
       EXPECT_TRUE(url1_query.find(brand_string) == std::string::npos);
     }
 #else
     // Chromium builds never add the brand to the parameter, even for google
     // queries.
     EXPECT_TRUE(url1_query.find(brand_string) == std::string::npos);
 #endif
+
+    RunUntilIdle();
   }
 
   // This makes sure that the extension updater properly stores the results
   // of a <daystart> tag from a manifest fetch in one of two cases: 1) This is
   // the first time we fetched the extension, or 2) We sent a ping value of
   // >= 1 day for the extension.
   void TestHandleManifestResults() {
-    ServiceForManifestTests service;
+    ServiceForManifestTests service(prefs_.get());
     GURL update_url("http://www.google.com/manifest");
     ExtensionList tmp;
     service.CreateTestExtensions(1, 1, &tmp, &update_url.spec(),
                                  Extension::INTERNAL);
     service.set_extensions(tmp);
 
     ExtensionUpdater updater(
         &service, service.extension_prefs(), service.pref_service(),
         service.profile(), kUpdateFrequencySecs);
     updater.Start();
     ResetDownloader(
         &updater,
         new ExtensionDownloader(&updater, service.request_context()));
 
     ManifestFetchData fetch_data(update_url);
     const Extension* extension = tmp[0];
     fetch_data.AddExtension(extension->id(), extension->VersionString(),
                             &kNeverPingedData, kEmptyUpdateUrlData, "");
     UpdateManifest::Results results;
     results.daystart_elapsed_seconds = 750;
 
     updater.downloader_->HandleManifestResults(fetch_data, &results);
     Time last_ping_day =
         service.extension_prefs()->LastPingDay(extension->id());
     EXPECT_FALSE(last_ping_day.is_null());
     int64 seconds_diff = (Time::Now() - last_ping_day).InSeconds();
     EXPECT_LT(seconds_diff - results.daystart_elapsed_seconds, 5);
   }
 
+ protected:
+  scoped_ptr<TestExtensionPrefs> prefs_;
+
  private:
   MessageLoop loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
   content::TestBrowserThread io_thread_;
 };
 
 // Because we test some private methods of ExtensionUpdater, it's easier for the
 // actual test code to live in ExtenionUpdaterTest methods instead of TEST_F
 // subclasses where friendship with ExtenionUpdater is not inherited.
@@ skipping 60 matching lines @@
 TEST_F(ExtensionUpdaterTest, TestGalleryRequestsWithNonOrganicBrand) {
   TestGalleryRequestsWithBrand(false);
 }
 
 TEST_F(ExtensionUpdaterTest, TestHandleManifestResults) {
   TestHandleManifestResults();
 }
 
 TEST_F(ExtensionUpdaterTest, TestNonAutoUpdateableLocations) {
   net::TestURLFetcherFactory factory;
-  ServiceForManifestTests service;
+  ServiceForManifestTests service(prefs_.get());
   ExtensionUpdater updater(&service, service.extension_prefs(),
                            service.pref_service(), service.profile(),
                            kUpdateFrequencySecs);
   MockExtensionDownloaderDelegate delegate;
   // Set the downloader directly, so that all its events end up in the mock
   // |delegate|.
   ExtensionDownloader* downloader =
       new ExtensionDownloader(&delegate, service.request_context());
   ResetDownloader(&updater, downloader);
 
@@ skipping 10 matching lines @@
   EXPECT_CALL(delegate, GetPingDataForExtension(updateable_id, _));
 
   service.set_extensions(extensions);
   updater.set_blacklist_checks_enabled(false);
   updater.Start();
   updater.CheckNow();
 }
 
 TEST_F(ExtensionUpdaterTest, TestUpdatingDisabledExtensions) {
   net::TestURLFetcherFactory factory;
-  ServiceForManifestTests service;
+  ServiceForManifestTests service(prefs_.get());
   ExtensionUpdater updater(&service, service.extension_prefs(),
                            service.pref_service(), service.profile(),
                            kUpdateFrequencySecs);
   MockExtensionDownloaderDelegate delegate;
   // Set the downloader directly, so that all its events end up in the mock
   // |delegate|.
   ExtensionDownloader* downloader =
       new ExtensionDownloader(&delegate, service.request_context());
   ResetDownloader(&updater, downloader);
 
@@ skipping 17 matching lines @@
 
   service.set_extensions(enabled_extensions);
   service.set_disabled_extensions(disabled_extensions);
   updater.set_blacklist_checks_enabled(false);
   updater.Start();
   updater.CheckNow();
 }
 
 TEST_F(ExtensionUpdaterTest, TestManifestFetchesBuilderAddExtension) {
   net::TestURLFetcherFactory factory;
-  MockService service;
+  MockService service(prefs_.get());
   MockExtensionDownloaderDelegate delegate;
   scoped_ptr<ExtensionDownloader> downloader(
       new ExtensionDownloader(&delegate, service.request_context()));
   EXPECT_EQ(0u, ManifestFetchersCount(downloader.get()));
 
   // First, verify that adding valid extensions does invoke the callbacks on
   // the delegate.
   std::string id = GenerateId("foo");
   EXPECT_CALL(delegate, GetPingDataForExtension(id, _)).WillOnce(Return(false));
   EXPECT_TRUE(
@@ skipping 31 matching lines @@
   EXPECT_EQ(1u, ManifestFetchersCount(downloader.get()));
 
   net::TestURLFetcher* fetcher =
       factory.GetFetcherByID(ExtensionDownloader::kManifestFetcherId);
   ASSERT_TRUE(fetcher);
   EXPECT_FALSE(fetcher->GetOriginalURL().is_empty());
 }
 
 TEST_F(ExtensionUpdaterTest, TestStartUpdateCheckMemory) {
   net::TestURLFetcherFactory factory;
-  MockService service;
+  MockService service(prefs_.get());
   MockExtensionDownloaderDelegate delegate;
   ExtensionDownloader downloader(&delegate, service.request_context());
 
   StartUpdateCheck(&downloader, new ManifestFetchData(GURL()));
   // This should delete the newly-created ManifestFetchData.
   StartUpdateCheck(&downloader, new ManifestFetchData(GURL()));
   // This should add into |manifests_pending_|.
   StartUpdateCheck(&downloader, new ManifestFetchData(GURL(
       GURL("http://www.google.com"))));
   // The dtor of |downloader| should delete the pending fetchers.
 }
 
 TEST_F(ExtensionUpdaterTest, TestCheckSoon) {
-  ServiceForManifestTests service;
+  ServiceForManifestTests service(prefs_.get());
   net::TestURLFetcherFactory factory;
   ExtensionUpdater updater(
       &service, service.extension_prefs(), service.pref_service(),
       service.profile(), kUpdateFrequencySecs);
   EXPECT_FALSE(updater.WillCheckSoon());
   updater.Start();
   EXPECT_FALSE(updater.WillCheckSoon());
   updater.CheckSoon();
   EXPECT_TRUE(updater.WillCheckSoon());
   updater.CheckSoon();
   EXPECT_TRUE(updater.WillCheckSoon());
-  RunAllPending();
+  RunUntilIdle();
   EXPECT_FALSE(updater.WillCheckSoon());
   updater.CheckSoon();
   EXPECT_TRUE(updater.WillCheckSoon());
   updater.Stop();
   EXPECT_FALSE(updater.WillCheckSoon());
 }
 
 // TODO(asargent) - (http://crbug.com/12780) add tests for:
 // -prodversionmin (shouldn't update if browser version too old)
 // -manifests & updates arriving out of order / interleaved
 // -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
 
 }  // namespace extensions