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

Side by Side Diff: chrome/browser/extensions/activity_log/activity_log_enabled_unittest.cc

Issue 48643003: Moved extension and value builder code to extensions component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase again Created 7 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/run_loop.h" 6 #include "base/run_loop.h"
7 #include "chrome/browser/extensions/activity_log/activity_log.h" 7 #include "chrome/browser/extensions/activity_log/activity_log.h"
8 #include "chrome/browser/extensions/api/activity_log_private/activity_log_privat e_api.h" 8 #include "chrome/browser/extensions/api/activity_log_private/activity_log_privat e_api.h"
9 #include "chrome/browser/extensions/extension_service.h" 9 #include "chrome/browser/extensions/extension_service.h"
10 #include "chrome/browser/extensions/test_extension_system.h" 10 #include "chrome/browser/extensions/test_extension_system.h"
11 #include "chrome/common/chrome_switches.h" 11 #include "chrome/common/chrome_switches.h"
12 #include "chrome/common/extensions/extension_builder.h"
13 #include "chrome/common/pref_names.h" 12 #include "chrome/common/pref_names.h"
14 #include "chrome/test/base/chrome_render_view_host_test_harness.h" 13 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
15 #include "chrome/test/base/testing_profile.h" 14 #include "chrome/test/base/testing_profile.h"
15 #include "extensions/common/extension_builder.h"
16 16
17 #if defined OS_CHROMEOS 17 #if defined OS_CHROMEOS
18 #include "chrome/browser/chromeos/login/user_manager.h" 18 #include "chrome/browser/chromeos/login/user_manager.h"
19 #include "chrome/browser/chromeos/settings/cros_settings.h" 19 #include "chrome/browser/chromeos/settings/cros_settings.h"
20 #include "chrome/browser/chromeos/settings/device_settings_service.h" 20 #include "chrome/browser/chromeos/settings/device_settings_service.h"
21 #endif 21 #endif
22 22
23 namespace extensions { 23 namespace extensions {
24 24
25 class ActivityLogEnabledTest : public ChromeRenderViewHostTestHarness { 25 class ActivityLogEnabledTest : public ChromeRenderViewHostTestHarness {
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 EXPECT_TRUE(activity_log->IsDatabaseEnabled()); 234 EXPECT_TRUE(activity_log->IsDatabaseEnabled());
235 EXPECT_FALSE( 235 EXPECT_FALSE(
236 profile->GetPrefs()->GetBoolean(prefs::kWatchdogExtensionActive)); 236 profile->GetPrefs()->GetBoolean(prefs::kWatchdogExtensionActive));
237 EXPECT_FALSE(activity_log->IsWatchdogAppActive()); 237 EXPECT_FALSE(activity_log->IsWatchdogAppActive());
238 238
239 // Cleanup. 239 // Cleanup.
240 *CommandLine::ForCurrentProcess() = saved_cmdline_; 240 *CommandLine::ForCurrentProcess() = saved_cmdline_;
241 } 241 }
242 242
243 } // namespace extensions 243 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698