chrome/browser/extensions/api/content_settings/content_settings_apitest.cc - Issue 670953006: Componentize HostContentSettingsMap and content settings providers.

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

Issue 670953006: Componentize HostContentSettingsMap and content settings providers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: win64 suppress warnings Created 6 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

« no previous file with comments | « chrome/browser/extensions/api/content_settings/content_settings_api.cc ('k') | chrome/browser/extensions/api/content_settings/content_settings_store.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/prefs/pref_service.h"	5 #include "base/prefs/pref_service.h"

6 #include "base/strings/utf_string_conversions.h"	6 #include "base/strings/utf_string_conversions.h"

7 #include "chrome/browser/browser_process.h"	7 #include "chrome/browser/browser_process.h"

8 #include "chrome/browser/chrome_notification_types.h"	8 #include "chrome/browser/chrome_notification_types.h"

9 #include "chrome/browser/content_settings/cookie_settings.h"	9 #include "chrome/browser/content_settings/cookie_settings.h"

10 #include "chrome/browser/content_settings/host_content_settings_map.h"

11 #include "chrome/browser/extensions/api/content_settings/content_settings_api.h"	10 #include "chrome/browser/extensions/api/content_settings/content_settings_api.h"

12 #include "chrome/browser/extensions/extension_apitest.h"	11 #include "chrome/browser/extensions/extension_apitest.h"

13 #include "chrome/browser/profiles/profile.h"	12 #include "chrome/browser/profiles/profile.h"

14 #include "chrome/browser/ui/browser.h"	13 #include "chrome/browser/ui/browser.h"

15 #include "chrome/common/chrome_switches.h"	14 #include "chrome/common/chrome_switches.h"

16 #include "chrome/common/pref_names.h"	15 #include "chrome/common/pref_names.h"

	16 #include "components/content_settings/core/browser/host_content_settings_map.h"

17 #include "content/public/browser/notification_service.h"	17 #include "content/public/browser/notification_service.h"

18 #include "content/public/browser/plugin_service.h"	18 #include "content/public/browser/plugin_service.h"

19 #include "content/public/common/webplugininfo.h"	19 #include "content/public/common/webplugininfo.h"

20 #include "content/public/test/test_utils.h"	20 #include "content/public/test/test_utils.h"

21 #include "extensions/browser/extension_registry.h"	21 #include "extensions/browser/extension_registry.h"

22 #include "extensions/browser/test_extension_registry_observer.h"	22 #include "extensions/browser/test_extension_registry_observer.h"

23	23

24 namespace {	24 namespace {

25	25

26 void ReleaseBrowserProcessModule() {	26 void ReleaseBrowserProcessModule() {

(...skipping 202 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
229 base::FilePath(kBarPath),	229 base::FilePath(kBarPath),

230 base::ASCIIToUTF16("2.3.4"),	230 base::ASCIIToUTF16("2.3.4"),

231 base::ASCIIToUTF16("bar")),	231 base::ASCIIToUTF16("bar")),

232 false);	232 false);

233	233

234 EXPECT_TRUE(RunExtensionTest("content_settings/getresourceidentifiers"))	234 EXPECT_TRUE(RunExtensionTest("content_settings/getresourceidentifiers"))

235 << message_;	235 << message_;

236 }	236 }

237	237

238 } // namespace extensions	238 } // namespace extensions

OLD	NEW