Revert 219709 "Remove the Extensions URLRequestContext."

trunk/src/apps/shell_window_geometry_cache_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 "apps/shell_window_geometry_cache.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/mock_pref_change_callback.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/test_extension_prefs.h"
 #include "chrome/test/base/testing_profile.h"
-#include "content/public/test/test_browser_thread_bundle.h"
+#include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
   static const char kWindowId[] = "windowid";
   static const char kWindowId2[] = "windowid2";
 
   const char kWindowGeometryKey[] = "window_geometry";
 } // namespace
 
 using content::BrowserThread;
 
 namespace apps {
 
 // Base class for tests.
 class ShellWindowGeometryCacheTest : public testing::Test {
  public:
-  ShellWindowGeometryCacheTest() {
+  ShellWindowGeometryCacheTest() :
+        ui_thread_(BrowserThread::UI, &ui_message_loop_) {
     prefs_.reset(new extensions::TestExtensionPrefs(
-        base::MessageLoopForUI::current()->message_loop_proxy().get()));
+        ui_message_loop_.message_loop_proxy().get()));
     cache_.reset(new ShellWindowGeometryCache(&profile_, prefs_->prefs()));
     cache_->SetSyncDelayForTests(0);
   }
 
   void AddGeometryAndLoadExtension(
       const std::string& extension_id,
       const std::string& window_id,
       const gfx::Rect& bounds,
       const gfx::Rect& screen_bounds,
       ui::WindowShowState state);
 
   // Spins the UI threads' message loops to make sure any task
   // posted to sync the geometry to the value store gets a chance to run.
   void WaitForSync();
 
   void LoadExtension(const std::string& extension_id);
   void UnloadExtension(const std::string& extension_id);
 
  protected:
-  content::TestBrowserThreadBundle thread_bundle_;
   TestingProfile profile_;
+  base::MessageLoopForUI ui_message_loop_;
+  content::TestBrowserThread ui_thread_;
   scoped_ptr<extensions::TestExtensionPrefs> prefs_;
   scoped_ptr<ShellWindowGeometryCache> cache_;
 };
 
 void ShellWindowGeometryCacheTest::AddGeometryAndLoadExtension(
     const std::string& extension_id,
     const std::string& window_id,
     const gfx::Rect& bounds,
     const gfx::Rect& screen_bounds,
     ui::WindowShowState state) {
@@ skipping 267 matching lines @@
   // The first added window should no longer have cached geometry.
   EXPECT_FALSE(cache_->GetGeometry(extension_id, "window_0", NULL, NULL, NULL));
   // All other windows should still exist.
   for (size_t i = 1; i < ShellWindowGeometryCache::kMaxCachedWindows + 1; ++i) {
     std::string window_id = "window_" + base::IntToString(i);
     EXPECT_TRUE(cache_->GetGeometry(extension_id, window_id, NULL, NULL, NULL));
   }
 }
 
 } // namespace extensions