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

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

Issue 2907493002: ChromeOS: Per-user time zone: refactor tests first. (Closed)
Patch Set: Fix debug build 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_enabled_unittest.cc
diff --git a/chrome/browser/extensions/activity_log/activity_log_enabled_unittest.cc b/chrome/browser/extensions/activity_log/activity_log_enabled_unittest.cc
index 87356ec40a1cfe1fb9f779e794fb60f8c2e16dd1..4432214c413eecc93de7d2e808f81fb50fc61d47 100644
--- a/chrome/browser/extensions/activity_log/activity_log_enabled_unittest.cc
+++ b/chrome/browser/extensions/activity_log/activity_log_enabled_unittest.cc
@@ -17,12 +17,6 @@
#include "extensions/browser/uninstall_reason.h"
#include "extensions/common/extension_builder.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
-
namespace extensions {
const char kExtensionID[] = "eplckmlabaanikjjcgnigddmagoglhmp";
@@ -31,23 +25,11 @@ class ActivityLogEnabledTest : public ChromeRenderViewHostTestHarness {
protected:
void SetUp() override {
ChromeRenderViewHostTestHarness::SetUp();
-#if defined OS_CHROMEOS
- test_user_manager_.reset(new chromeos::ScopedTestUserManager());
-#endif
}
void TearDown() override {
-#if defined OS_CHROMEOS
- test_user_manager_.reset();
-#endif
ChromeRenderViewHostTestHarness::TearDown();
}
-
-#if defined OS_CHROMEOS
- chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;
- chromeos::ScopedTestCrosSettings test_cros_settings_;
- std::unique_ptr<chromeos::ScopedTestUserManager> test_user_manager_;
-#endif
};
TEST_F(ActivityLogEnabledTest, NoSwitch) {

Powered by Google App Engine
This is Rietveld 408576698