Index: chrome/browser/extensions/activity_log/activity_database_unittest.cc |
diff --git a/chrome/browser/extensions/activity_log/activity_database_unittest.cc b/chrome/browser/extensions/activity_log/activity_database_unittest.cc |
index 4006d6ee93f18949dd44ec0b46c53d1948ce08af..423f5a1077326263eccfd4ea6a37752da291d810 100644 |
--- a/chrome/browser/extensions/activity_log/activity_database_unittest.cc |
+++ b/chrome/browser/extensions/activity_log/activity_database_unittest.cc |
@@ -38,13 +38,11 @@ namespace extensions { |
class ActivityDatabaseTest : public ChromeRenderViewHostTestHarness { |
public: |
- ActivityDatabaseTest() |
- : ui_thread_(BrowserThread::UI, MessageLoop::current()), |
- db_thread_(BrowserThread::DB, MessageLoop::current()), |
- file_thread_(BrowserThread::FILE, MessageLoop::current()) {} |
- |
virtual void SetUp() OVERRIDE { |
ChromeRenderViewHostTestHarness::SetUp(); |
+#if defined OS_CHROMEOS |
+ test_user_manager_.reset(new chromeos::ScopedTestUserManager()); |
Jeffrey Yasskin
2013/05/27 03:12:13
I don't like having to move value objects into sco
awong
2013/05/30 21:46:09
Yeah. All choices are bad.
(1) We can't move all
|
+#endif |
CommandLine command_line(CommandLine::NO_PROGRAM); |
profile_ = |
Profile::FromBrowserContext(web_contents()->GetBrowserContext()); |
@@ -55,9 +53,11 @@ class ActivityDatabaseTest : public ChromeRenderViewHostTestHarness { |
switches::kEnableExtensionActivityLogTesting); |
} |
- virtual ~ActivityDatabaseTest() { |
- MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); |
- MessageLoop::current()->Run(); |
+ virtual void TearDown() OVERRIDE { |
+#if defined OS_CHROMEOS |
+ test_user_manager_.reset(); |
+#endif |
+ ChromeRenderViewHostTestHarness::TearDown(); |
} |
protected: |
@@ -65,15 +65,11 @@ class ActivityDatabaseTest : public ChromeRenderViewHostTestHarness { |
Profile* profile_; |
private: |
- content::TestBrowserThread ui_thread_; |
- content::TestBrowserThread db_thread_; |
- content::TestBrowserThread file_thread_; |
- |
#if defined OS_CHROMEOS |
chromeos::ScopedStubCrosEnabler stub_cros_enabler_; |
chromeos::ScopedTestDeviceSettingsService test_device_settings_service_; |
chromeos::ScopedTestCrosSettings test_cros_settings_; |
- chromeos::ScopedTestUserManager test_user_manager_; |
+ scoped_ptr<chromeos::ScopedTestUserManager> test_user_manager_; |
#endif |
}; |