Revert 219709 "Remove the Extensions URLRequestContext."

trunk/src/chrome/browser/extensions/api/storage/settings_frontend_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 "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
-#include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/storage/leveldb_settings_storage_factory.h"
 #include "chrome/browser/extensions/api/storage/settings_frontend.h"
 #include "chrome/browser/extensions/api/storage/settings_namespace.h"
 #include "chrome/browser/extensions/api/storage/settings_test_util.h"
 #include "chrome/browser/value_store/value_store.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/test/test_browser_thread_bundle.h"
+#include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 
 namespace extensions {
 
 namespace settings = settings_namespace;
 namespace util = settings_test_util;
 
 namespace {
@@ skipping 17 matching lines @@
     megabyte->Append(CreateKilobyte().release());
   }
   return scoped_ptr<Value>(megabyte);
 }
 
 }  // namespace
 
 class ExtensionSettingsFrontendTest : public testing::Test {
  public:
   ExtensionSettingsFrontendTest()
-      : storage_factory_(new util::ScopedSettingsStorageFactory()) {}
+      : storage_factory_(new util::ScopedSettingsStorageFactory()),
+        ui_thread_(BrowserThread::UI, base::MessageLoop::current()),
+        file_thread_(BrowserThread::FILE, base::MessageLoop::current()) {}
 
   virtual void SetUp() OVERRIDE {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     profile_.reset(new util::MockProfile(temp_dir_.path()));
     ResetFrontend();
   }
 
   virtual void TearDown() OVERRIDE {
     frontend_.reset();
     profile_.reset();
     // Execute any pending deletion tasks.
-    base::RunLoop().RunUntilIdle();
+    message_loop_.RunUntilIdle();
   }
 
  protected:
   void ResetFrontend() {
     storage_factory_->Reset(new LeveldbSettingsStorageFactory());
     frontend_.reset(
         SettingsFrontend::Create(storage_factory_.get(), profile_.get()));
   }
 
-  content::TestBrowserThreadBundle thread_bundle_;
   base::ScopedTempDir temp_dir_;
   scoped_ptr<util::MockProfile> profile_;
   scoped_ptr<SettingsFrontend> frontend_;
   scoped_refptr<util::ScopedSettingsStorageFactory> storage_factory_;
+
+ private:
+  base::MessageLoop message_loop_;
+  content::TestBrowserThread ui_thread_;
+  content::TestBrowserThread file_thread_;
 };
 
 // Get a semblance of coverage for both extension and app settings by
 // alternating in each test.
 // TODO(kalman): explicitly test the two interact correctly.
 
 TEST_F(ExtensionSettingsFrontendTest, SettingsPreservedAcrossReconstruction) {
   const std::string id = "ext";
   ExtensionServiceInterface* esi =
       extensions::ExtensionSystem::Get(profile_.get())->extension_service();
@@ skipping 36 matching lines @@
   ValueStore* storage = util::GetStorage(id, frontend_.get());
 
   {
     StringValue bar("bar");
     ValueStore::WriteResult result = storage->Set(DEFAULTS, "foo", bar);
     ASSERT_FALSE(result->HasError());
   }
 
   // This would be triggered by extension uninstall via a DataDeleter.
   frontend_->DeleteStorageSoon(id);
-  base::RunLoop().RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
 
   // The storage area may no longer be valid post-uninstall, so re-request.
   storage = util::GetStorage(id, frontend_.get());
   {
     ValueStore::ReadResult result = storage->Get();
     ASSERT_FALSE(result->HasError());
     EXPECT_TRUE(result->settings()->empty());
   }
 }
 
@@ skipping 15 matching lines @@
 
   // Should need to both clear the database and delete the frontend for the
   // leveldb database to be deleted from disk.
   {
     ValueStore::WriteResult result = storage->Clear();
     ASSERT_FALSE(result->HasError());
     EXPECT_TRUE(base::PathExists(temp_dir_.path()));
   }
 
   frontend_.reset();
-  base::RunLoop().RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
   // TODO(kalman): Figure out why this fails, despite appearing to work.
   // Leaving this commented out rather than disabling the whole test so that the
   // deletion code paths are at least exercised.
   //EXPECT_FALSE(base::PathExists(temp_dir_.path()));
 }
 
 TEST_F(ExtensionSettingsFrontendTest,
        QuotaLimitsEnforcedCorrectlyForSyncAndLocal) {
   const std::string id = "ext";
   ExtensionServiceInterface* esi =
@@ skipping 84 matching lines @@
       extensions::ExtensionSystem::Get(profile_.get())->extension_service();
   static_cast<extensions::settings_test_util::MockExtensionService*>(esi)->
       AddExtensionWithIdAndPermissions(id, Manifest::TYPE_EXTENSION,
           permissions);
 
   frontend_->RunWithStorage(
       id, settings::SYNC, base::Bind(&UnlimitedSyncStorageTestCallback));
   frontend_->RunWithStorage(
       id, settings::LOCAL, base::Bind(&UnlimitedLocalStorageTestCallback));
 
-  base::RunLoop().RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
 }
 
 }  // namespace extensions