| 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" |
| 11 #include "chrome/browser/extensions/test_extension_system.h" | 11 #include "chrome/browser/extensions/test_extension_system.h" |
| 12 #include "chrome/common/chrome_switches.h" | 12 #include "chrome/common/chrome_switches.h" |
| 13 #include "chrome/common/pref_names.h" | 13 #include "chrome/common/pref_names.h" |
| 14 #include "chrome/test/base/chrome_render_view_host_test_harness.h" | 14 #include "chrome/test/base/chrome_render_view_host_test_harness.h" |
| 15 #include "chrome/test/base/testing_profile.h" | 15 #include "chrome/test/base/testing_profile.h" |
| 16 #include "extensions/browser/uninstall_reason.h" |
| 16 #include "extensions/common/extension_builder.h" | 17 #include "extensions/common/extension_builder.h" |
| 17 | 18 |
| 18 #if defined OS_CHROMEOS | 19 #if defined OS_CHROMEOS |
| 19 #include "chrome/browser/chromeos/login/users/user_manager.h" | 20 #include "chrome/browser/chromeos/login/users/user_manager.h" |
| 20 #include "chrome/browser/chromeos/settings/cros_settings.h" | 21 #include "chrome/browser/chromeos/settings/cros_settings.h" |
| 21 #include "chrome/browser/chromeos/settings/device_settings_service.h" | 22 #include "chrome/browser/chromeos/settings/device_settings_service.h" |
| 22 #endif | 23 #endif |
| 23 | 24 |
| 24 namespace extensions { | 25 namespace extensions { |
| 25 | 26 |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 EXPECT_EQ(1, | 183 EXPECT_EQ(1, |
| 183 profile1->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive)); | 184 profile1->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive)); |
| 184 EXPECT_EQ(0, | 185 EXPECT_EQ(0, |
| 185 profile2->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive)); | 186 profile2->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive)); |
| 186 EXPECT_TRUE(activity_log1->IsWatchdogAppActive()); | 187 EXPECT_TRUE(activity_log1->IsWatchdogAppActive()); |
| 187 EXPECT_FALSE(activity_log2->IsWatchdogAppActive()); | 188 EXPECT_FALSE(activity_log2->IsWatchdogAppActive()); |
| 188 EXPECT_TRUE(activity_log1->IsDatabaseEnabled()); | 189 EXPECT_TRUE(activity_log1->IsDatabaseEnabled()); |
| 189 EXPECT_FALSE(activity_log2->IsDatabaseEnabled()); | 190 EXPECT_FALSE(activity_log2->IsDatabaseEnabled()); |
| 190 | 191 |
| 191 extension_service1->UninstallExtension( | 192 extension_service1->UninstallExtension( |
| 192 kExtensionID, ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL); | 193 kExtensionID, extensions::UNINSTALL_REASON_FOR_TESTING, NULL); |
| 193 | 194 |
| 194 EXPECT_EQ(0, | 195 EXPECT_EQ(0, |
| 195 profile1->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive)); | 196 profile1->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive)); |
| 196 EXPECT_EQ(0, | 197 EXPECT_EQ(0, |
| 197 profile2->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive)); | 198 profile2->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive)); |
| 198 EXPECT_FALSE(activity_log1->IsWatchdogAppActive()); | 199 EXPECT_FALSE(activity_log1->IsWatchdogAppActive()); |
| 199 EXPECT_FALSE(activity_log2->IsWatchdogAppActive()); | 200 EXPECT_FALSE(activity_log2->IsWatchdogAppActive()); |
| 200 EXPECT_FALSE(activity_log1->IsDatabaseEnabled()); | 201 EXPECT_FALSE(activity_log1->IsDatabaseEnabled()); |
| 201 EXPECT_FALSE(activity_log2->IsDatabaseEnabled()); | 202 EXPECT_FALSE(activity_log2->IsDatabaseEnabled()); |
| 202 | 203 |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 258 .SetID(kExtensionID) | 259 .SetID(kExtensionID) |
| 259 .Build(); | 260 .Build(); |
| 260 extension_service->AddExtension(extension.get()); | 261 extension_service->AddExtension(extension.get()); |
| 261 | 262 |
| 262 EXPECT_TRUE(activity_log->IsDatabaseEnabled()); | 263 EXPECT_TRUE(activity_log->IsDatabaseEnabled()); |
| 263 EXPECT_EQ(1, | 264 EXPECT_EQ(1, |
| 264 profile->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive)); | 265 profile->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive)); |
| 265 EXPECT_TRUE(activity_log->IsWatchdogAppActive()); | 266 EXPECT_TRUE(activity_log->IsWatchdogAppActive()); |
| 266 | 267 |
| 267 extension_service->UninstallExtension( | 268 extension_service->UninstallExtension( |
| 268 kExtensionID, ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL); | 269 kExtensionID, extensions::UNINSTALL_REASON_FOR_TESTING, NULL); |
| 269 | 270 |
| 270 EXPECT_TRUE(activity_log->IsDatabaseEnabled()); | 271 EXPECT_TRUE(activity_log->IsDatabaseEnabled()); |
| 271 EXPECT_EQ(0, | 272 EXPECT_EQ(0, |
| 272 profile->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive)); | 273 profile->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive)); |
| 273 EXPECT_FALSE(activity_log->IsWatchdogAppActive()); | 274 EXPECT_FALSE(activity_log->IsWatchdogAppActive()); |
| 274 | 275 |
| 275 // Cleanup. | 276 // Cleanup. |
| 276 *CommandLine::ForCurrentProcess() = saved_cmdline_; | 277 *CommandLine::ForCurrentProcess() = saved_cmdline_; |
| 277 } | 278 } |
| 278 | 279 |
| 279 } // namespace extensions | 280 } // namespace extensions |
| OLD | NEW |