Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1266)

Unified Diff: chrome/browser/extensions/activity_log/activity_log_unittest.cc

Issue 2907493002: ChromeOS: Per-user time zone: refactor tests first. (Closed)
Patch Set: Update after review. Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 d0aa3a4b969c23d346a761b3e287b47bea362f01..5961be5bcfc2c4e8ff86a3a477070cec448f8ee2 100644
--- a/chrome/browser/extensions/activity_log/activity_log_unittest.cc
+++ b/chrome/browser/extensions/activity_log/activity_log_unittest.cc
@@ -34,7 +34,6 @@
#include "testing/gtest/include/gtest/gtest.h"
#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/login/users/scoped_test_user_manager.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chrome/browser/chromeos/settings/device_settings_service.h"
#endif
@@ -65,9 +64,6 @@ class ActivityLogTest : public ChromeRenderViewHostTestHarness {
virtual bool enable_activity_logging_switch() const { return true; }
void SetUp() override {
ChromeRenderViewHostTestHarness::SetUp();
-#if defined OS_CHROMEOS
- test_user_manager_.reset(new chromeos::ScopedTestUserManager());
-#endif
base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
if (enable_activity_logging_switch()) {
base::CommandLine::ForCurrentProcess()->AppendSwitch(
@@ -82,9 +78,6 @@ class ActivityLogTest : public ChromeRenderViewHostTestHarness {
}
void TearDown() override {
-#if defined OS_CHROMEOS
- test_user_manager_.reset();
-#endif
base::RunLoop().RunUntilIdle();
ChromeRenderViewHostTestHarness::TearDown();
}
@@ -202,7 +195,6 @@ class ActivityLogTest : public ChromeRenderViewHostTestHarness {
#if defined OS_CHROMEOS
chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;
chromeos::ScopedTestCrosSettings test_cros_settings_;
- std::unique_ptr<chromeos::ScopedTestUserManager> test_user_manager_;
#endif
};

Powered by Google App Engine
This is Rietveld 408576698