Revert 219709 "Remove the Extensions URLRequestContext."

trunk/src/chrome/browser/extensions/menu_manager_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 <vector>
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
-#include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/event_names.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/extensions/menu_manager.h"
 #include "chrome/browser/extensions/test_extension_prefs.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/api/context_menus.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/common/context_menu_params.h"
-#include "content/public/test/test_browser_thread_bundle.h"
+#include "content/public/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
 using testing::_;
 using testing::AtLeast;
 using testing::DeleteArg;
 using testing::InSequence;
 using testing::Return;
 using testing::SaveArg;
 
 namespace extensions {
 
 namespace context_menus = api::context_menus;
 
 // Base class for tests.
 class MenuManagerTest : public testing::Test {
  public:
   MenuManagerTest()
-      : manager_(&profile_),
-        prefs_(base::MessageLoopForUI::current()->message_loop_proxy().get()),
+      : ui_thread_(BrowserThread::UI, &message_loop_),
+        file_thread_(BrowserThread::FILE, &message_loop_),
+        manager_(&profile_),
+        prefs_(message_loop_.message_loop_proxy().get()),
         next_id_(1) {}
 
   virtual void TearDown() OVERRIDE {
     prefs_.pref_service()->CommitPendingWrite();
-    base::RunLoop().RunUntilIdle();
+    message_loop_.RunUntilIdle();
   }
 
   // Returns a test item.
   MenuItem* CreateTestItem(Extension* extension, bool incognito = false) {
     MenuItem::Type type = MenuItem::NORMAL;
     MenuItem::ContextList contexts(MenuItem::ALL);
     MenuItem::Id id(incognito, extension->id());
     id.uid = next_id_++;
     return new MenuItem(id, "test", false, true, type, contexts);
   }
@@ skipping 10 matching lines @@
 
   // Creates and returns a test Extension. The caller does *not* own the return
   // value.
   Extension* AddExtension(std::string name) {
     scoped_refptr<Extension> extension = prefs_.AddExtension(name);
     extensions_.push_back(extension);
     return extension.get();
   }
 
  protected:
-  content::TestBrowserThreadBundle thread_bundle_;
+  base::MessageLoopForUI message_loop_;
+  content::TestBrowserThread ui_thread_;
+  content::TestBrowserThread file_thread_;
   TestingProfile profile_;
 
   MenuManager manager_;
   ExtensionList extensions_;
   TestExtensionPrefs prefs_;
   int next_id_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MenuManagerTest);
 };
@@ skipping 649 matching lines @@
   EXPECT_EQ(4u, manager_.MenuItems(extension1->id())->size());
   EXPECT_EQ(1u, manager_.MenuItems(extension2->id())->size());
 
   // Remove all context menu items with incognito true.
   manager_.RemoveAllIncognitoContextItems();
   EXPECT_EQ(2u, manager_.MenuItems(extension1->id())->size());
   EXPECT_EQ(1u, manager_.MenuItems(extension2->id())->size());
 }
 
 }  // namespace extensions