Index: chrome/browser/extensions/activity_log/activity_log_unittest.cc |
diff --git a/chrome/browser/extensions/activity_log/activity_log_unittest.cc b/chrome/browser/extensions/activity_log/activity_log_unittest.cc |
index d37f6827e97b0091ddf062dea5b38e3f615ac861..ad186c567fcfa89d13634d31b4a7a2b0afb003aa 100644 |
--- a/chrome/browser/extensions/activity_log/activity_log_unittest.cc |
+++ b/chrome/browser/extensions/activity_log/activity_log_unittest.cc |
@@ -16,7 +16,6 @@ |
#include "chrome/test/base/chrome_render_view_host_test_harness.h" |
#include "chrome/test/base/testing_profile.h" |
#include "content/public/browser/browser_thread.h" |
-#include "content/public/test/test_browser_thread.h" |
#include "sql/statement.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -30,13 +29,11 @@ namespace extensions { |
class ActivityLogTest : public ChromeRenderViewHostTestHarness { |
public: |
- ActivityLogTest() |
- : ui_thread_(BrowserThread::UI, base::MessageLoop::current()), |
- db_thread_(BrowserThread::DB, base::MessageLoop::current()), |
- file_thread_(BrowserThread::FILE, base::MessageLoop::current()) {} |
- |
virtual void SetUp() OVERRIDE { |
ChromeRenderViewHostTestHarness::SetUp(); |
+#if defined OS_CHROMEOS |
+ test_user_manager_.reset(new chromeos::ScopedTestUserManager()); |
+#endif |
CommandLine command_line(CommandLine::NO_PROGRAM); |
profile_ = |
Profile::FromBrowserContext(web_contents()->GetBrowserContext()); |
@@ -50,10 +47,11 @@ class ActivityLogTest : public ChromeRenderViewHostTestHarness { |
ActivityLog::RecomputeLoggingIsEnabled(); |
} |
- virtual ~ActivityLogTest() { |
- base::MessageLoop::current()->PostTask(FROM_HERE, |
- base::MessageLoop::QuitClosure()); |
- base::MessageLoop::current()->Run(); |
+ virtual void TearDown() OVERRIDE { |
+#if defined OS_CHROMEOS |
+ test_user_manager_.reset(); |
+#endif |
+ ChromeRenderViewHostTestHarness::TearDown(); |
} |
static void RetrieveActions_LogAndFetchActions( |
@@ -81,15 +79,10 @@ class ActivityLogTest : public ChromeRenderViewHostTestHarness { |
ExtensionService* extension_service_; |
Profile* profile_; |
- private: |
- content::TestBrowserThread ui_thread_; |
- content::TestBrowserThread db_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 |
}; |