Index: chrome/browser/extensions/page_action_controller_unittest.cc |
diff --git a/chrome/browser/extensions/page_action_controller_unittest.cc b/chrome/browser/extensions/page_action_controller_unittest.cc |
index b18d9c8c040e76c992c8d73c61bf7ed608b1d160..57c75829030b79f75604b17245ebaf0a26b2be44 100644 |
--- a/chrome/browser/extensions/page_action_controller_unittest.cc |
+++ b/chrome/browser/extensions/page_action_controller_unittest.cc |
@@ -28,19 +28,16 @@ |
#include "chrome/browser/chromeos/settings/device_settings_service.h" |
#endif |
-using content::BrowserThread; |
- |
namespace extensions { |
namespace { |
class PageActionControllerTest : public ChromeRenderViewHostTestHarness { |
- public: |
- PageActionControllerTest() |
- : ui_thread_(BrowserThread::UI, MessageLoop::current()), |
- file_thread_(BrowserThread::FILE, MessageLoop::current()) {} |
- |
+ protected: |
virtual void SetUp() OVERRIDE { |
ChromeRenderViewHostTestHarness::SetUp(); |
+#if defined OS_CHROMEOS |
+ test_user_manager_.reset(new chromeos::ScopedTestUserManager()); |
+#endif |
TabHelper::CreateForWebContents(web_contents()); |
// Create an ExtensionService so the PageActionController can find its |
// extensions. |
@@ -52,7 +49,13 @@ class PageActionControllerTest : public ChromeRenderViewHostTestHarness { |
&command_line, base::FilePath(), false); |
} |
- protected: |
+ virtual void TearDown() OVERRIDE { |
+#if defined OS_CHROMEOS |
+ test_user_manager_.reset(); |
+#endif |
+ ChromeRenderViewHostTestHarness::TearDown(); |
+ } |
+ |
int tab_id() { |
return SessionID::IdForTab(web_contents()); |
} |
@@ -60,13 +63,10 @@ class PageActionControllerTest : public ChromeRenderViewHostTestHarness { |
ExtensionService* extension_service_; |
private: |
- content::TestBrowserThread ui_thread_; |
- content::TestBrowserThread file_thread_; |
- |
#if defined OS_CHROMEOS |
chromeos::ScopedTestDeviceSettingsService test_device_settings_service_; |
chromeos::ScopedTestCrosSettings test_cros_settings_; |
- chromeos::ScopedTestUserManager test_user_manager_; |
+ scoped_ptr<chromeos::ScopedTestUserManager> test_user_manager_; |
#endif |
}; |