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

Side by Side Diff: chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/location.h" 5 #include "base/location.h"
6 #include "base/prefs/pref_service.h"
7 #include "base/single_thread_task_runner.h" 6 #include "base/single_thread_task_runner.h"
8 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
9 #include "base/thread_task_runner_handle.h" 8 #include "base/thread_task_runner_handle.h"
10 #include "build/build_config.h" 9 #include "build/build_config.h"
11 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
12 #include "chrome/browser/chrome_notification_types.h" 11 #include "chrome/browser/chrome_notification_types.h"
13 #include "chrome/browser/content_settings/cookie_settings_factory.h" 12 #include "chrome/browser/content_settings/cookie_settings_factory.h"
14 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" 13 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
15 #include "chrome/browser/extensions/api/content_settings/content_settings_api.h" 14 #include "chrome/browser/extensions/api/content_settings/content_settings_api.h"
16 #include "chrome/browser/extensions/extension_apitest.h" 15 #include "chrome/browser/extensions/extension_apitest.h"
17 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/browser/ui/browser.h" 17 #include "chrome/browser/ui/browser.h"
19 #include "chrome/common/chrome_switches.h" 18 #include "chrome/common/chrome_switches.h"
20 #include "components/content_settings/core/browser/cookie_settings.h" 19 #include "components/content_settings/core/browser/cookie_settings.h"
21 #include "components/content_settings/core/browser/host_content_settings_map.h" 20 #include "components/content_settings/core/browser/host_content_settings_map.h"
21 #include "components/prefs/pref_service.h"
22 #include "content/public/browser/notification_service.h" 22 #include "content/public/browser/notification_service.h"
23 #include "content/public/browser/plugin_service.h" 23 #include "content/public/browser/plugin_service.h"
24 #include "content/public/common/content_switches.h" 24 #include "content/public/common/content_switches.h"
25 #include "content/public/common/webplugininfo.h" 25 #include "content/public/common/webplugininfo.h"
26 #include "content/public/test/test_utils.h" 26 #include "content/public/test/test_utils.h"
27 #include "extensions/browser/extension_registry.h" 27 #include "extensions/browser/extension_registry.h"
28 #include "extensions/browser/test_extension_registry_observer.h" 28 #include "extensions/browser/test_extension_registry_observer.h"
29 29
30 namespace { 30 namespace {
31 31
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 << message_; 299 << message_;
300 } 300 }
301 301
302 IN_PROC_BROWSER_TEST_F(ExtensionContentSettingsApiTest, 302 IN_PROC_BROWSER_TEST_F(ExtensionContentSettingsApiTest,
303 UnsupportedDefaultSettings) { 303 UnsupportedDefaultSettings) {
304 const char kExtensionPath[] = "content_settings/unsupporteddefaultsettings"; 304 const char kExtensionPath[] = "content_settings/unsupporteddefaultsettings";
305 EXPECT_TRUE(RunExtensionSubtest(kExtensionPath, "test.html")) << message_; 305 EXPECT_TRUE(RunExtensionSubtest(kExtensionPath, "test.html")) << message_;
306 } 306 }
307 307
308 } // namespace extensions 308 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698