Index: chrome/browser/extensions/menu_manager_unittest.cc |
diff --git a/chrome/browser/extensions/menu_manager_unittest.cc b/chrome/browser/extensions/menu_manager_unittest.cc |
index 5fef312b062d4b89a4ceb4d6ab9257ce5f3072ad..84bbcec3a2d39bfd4360be0b948165cf6c48f0a2 100644 |
--- a/chrome/browser/extensions/menu_manager_unittest.cc |
+++ b/chrome/browser/extensions/menu_manager_unittest.cc |
@@ -10,6 +10,7 @@ |
#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" |
@@ -27,11 +28,10 @@ |
#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.h" |
+#include "content/public/test/test_browser_thread_bundle.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; |
@@ -47,15 +47,13 @@ namespace context_menus = api::context_menus; |
class MenuManagerTest : public testing::Test { |
public: |
MenuManagerTest() |
- : ui_thread_(BrowserThread::UI, &message_loop_), |
- file_thread_(BrowserThread::FILE, &message_loop_), |
- manager_(&profile_), |
- prefs_(message_loop_.message_loop_proxy().get()), |
+ : manager_(&profile_), |
+ prefs_(base::MessageLoopForUI::current()->message_loop_proxy().get()), |
next_id_(1) {} |
virtual void TearDown() OVERRIDE { |
prefs_.pref_service()->CommitPendingWrite(); |
- message_loop_.RunUntilIdle(); |
+ base::RunLoop().RunUntilIdle(); |
} |
// Returns a test item. |
@@ -86,9 +84,7 @@ class MenuManagerTest : public testing::Test { |
} |
protected: |
- base::MessageLoopForUI message_loop_; |
- content::TestBrowserThread ui_thread_; |
- content::TestBrowserThread file_thread_; |
+ content::TestBrowserThreadBundle thread_bundle_; |
TestingProfile profile_; |
MenuManager manager_; |