| Index: apps/shell_window_geometry_cache_unittest.cc
|
| diff --git a/apps/shell_window_geometry_cache_unittest.cc b/apps/shell_window_geometry_cache_unittest.cc
|
| index 2b42d48d43afc87263cc74a6b01b582d1084a3b2..0d6e6e49ffd8d82ad32399e9586eb77d9a294db5 100644
|
| --- a/apps/shell_window_geometry_cache_unittest.cc
|
| +++ b/apps/shell_window_geometry_cache_unittest.cc
|
| @@ -9,7 +9,7 @@
|
| #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.h"
|
| +#include "content/public/test/test_browser_thread_bundle.h"
|
| #include "content/public/test/test_utils.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| @@ -27,10 +27,9 @@ namespace apps {
|
| // Base class for tests.
|
| class ShellWindowGeometryCacheTest : public testing::Test {
|
| public:
|
| - ShellWindowGeometryCacheTest() :
|
| - ui_thread_(BrowserThread::UI, &ui_message_loop_) {
|
| + ShellWindowGeometryCacheTest() {
|
| prefs_.reset(new extensions::TestExtensionPrefs(
|
| - ui_message_loop_.message_loop_proxy().get()));
|
| + base::MessageLoopForUI::current()->message_loop_proxy().get()));
|
| cache_.reset(new ShellWindowGeometryCache(&profile_, prefs_->prefs()));
|
| cache_->SetSyncDelayForTests(0);
|
| }
|
| @@ -50,9 +49,8 @@ class ShellWindowGeometryCacheTest : public testing::Test {
|
| 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_;
|
| };
|
|
|