OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/prefs/pref_service.h" | 6 #include "base/prefs/pref_service.h" |
7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
8 #include "chrome/browser/extensions/activity_log/activity_log.h" | 8 #include "chrome/browser/extensions/activity_log/activity_log.h" |
9 #include "chrome/browser/extensions/api/activity_log_private/activity_log_privat
e_api.h" | 9 #include "chrome/browser/extensions/api/activity_log_private/activity_log_privat
e_api.h" |
10 #include "chrome/browser/extensions/extension_service.h" | 10 #include "chrome/browser/extensions/extension_service.h" |
(...skipping 10 matching lines...) Expand all Loading... |
21 #include "chrome/browser/chromeos/settings/cros_settings.h" | 21 #include "chrome/browser/chromeos/settings/cros_settings.h" |
22 #include "chrome/browser/chromeos/settings/device_settings_service.h" | 22 #include "chrome/browser/chromeos/settings/device_settings_service.h" |
23 #endif | 23 #endif |
24 | 24 |
25 namespace extensions { | 25 namespace extensions { |
26 | 26 |
27 const char* kExtensionID = "abjoigjokfeibfhiahiijggogladbmfm"; | 27 const char* kExtensionID = "abjoigjokfeibfhiahiijggogladbmfm"; |
28 | 28 |
29 class ActivityLogEnabledTest : public ChromeRenderViewHostTestHarness { | 29 class ActivityLogEnabledTest : public ChromeRenderViewHostTestHarness { |
30 protected: | 30 protected: |
31 virtual void SetUp() OVERRIDE { | 31 virtual void SetUp() override { |
32 ChromeRenderViewHostTestHarness::SetUp(); | 32 ChromeRenderViewHostTestHarness::SetUp(); |
33 #if defined OS_CHROMEOS | 33 #if defined OS_CHROMEOS |
34 test_user_manager_.reset(new chromeos::ScopedTestUserManager()); | 34 test_user_manager_.reset(new chromeos::ScopedTestUserManager()); |
35 #endif | 35 #endif |
36 } | 36 } |
37 | 37 |
38 virtual void TearDown() OVERRIDE { | 38 virtual void TearDown() override { |
39 #if defined OS_CHROMEOS | 39 #if defined OS_CHROMEOS |
40 test_user_manager_.reset(); | 40 test_user_manager_.reset(); |
41 #endif | 41 #endif |
42 ChromeRenderViewHostTestHarness::TearDown(); | 42 ChromeRenderViewHostTestHarness::TearDown(); |
43 } | 43 } |
44 | 44 |
45 #if defined OS_CHROMEOS | 45 #if defined OS_CHROMEOS |
46 chromeos::ScopedTestDeviceSettingsService test_device_settings_service_; | 46 chromeos::ScopedTestDeviceSettingsService test_device_settings_service_; |
47 chromeos::ScopedTestCrosSettings test_cros_settings_; | 47 chromeos::ScopedTestCrosSettings test_cros_settings_; |
48 scoped_ptr<chromeos::ScopedTestUserManager> test_user_manager_; | 48 scoped_ptr<chromeos::ScopedTestUserManager> test_user_manager_; |
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
277 EXPECT_TRUE(activity_log->IsDatabaseEnabled()); | 277 EXPECT_TRUE(activity_log->IsDatabaseEnabled()); |
278 EXPECT_EQ(0, | 278 EXPECT_EQ(0, |
279 profile->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive)); | 279 profile->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive)); |
280 EXPECT_FALSE(activity_log->IsWatchdogAppActive()); | 280 EXPECT_FALSE(activity_log->IsWatchdogAppActive()); |
281 | 281 |
282 // Cleanup. | 282 // Cleanup. |
283 *CommandLine::ForCurrentProcess() = saved_cmdline_; | 283 *CommandLine::ForCurrentProcess() = saved_cmdline_; |
284 } | 284 } |
285 | 285 |
286 } // namespace extensions | 286 } // namespace extensions |
OLD | NEW |