chrome/browser/extensions/api/content_settings/content_settings_apitest.cc - Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments, merge to LKGR. Created 7 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/extensions/api/content_settings/content_settings_api.cc ('k') | chrome/browser/extensions/api/downloads/downloads_api_unittest.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/utf_string_conversions.h"	6 #include "base/utf_string_conversions.h"

6 #include "chrome/browser/content_settings/cookie_settings.h"	7 #include "chrome/browser/content_settings/cookie_settings.h"

7 #include "chrome/browser/content_settings/host_content_settings_map.h"	8 #include "chrome/browser/content_settings/host_content_settings_map.h"

8 #include "chrome/browser/extensions/api/content_settings/content_settings_api.h"	9 #include "chrome/browser/extensions/api/content_settings/content_settings_api.h"

9 #include "chrome/browser/extensions/extension_apitest.h"	10 #include "chrome/browser/extensions/extension_apitest.h"

10 #include "chrome/browser/prefs/pref_service.h"

11 #include "chrome/browser/profiles/profile.h"	11 #include "chrome/browser/profiles/profile.h"

12 #include "chrome/browser/ui/browser.h"	12 #include "chrome/browser/ui/browser.h"

13 #include "chrome/common/chrome_switches.h"	13 #include "chrome/common/chrome_switches.h"

14 #include "chrome/common/pref_names.h"	14 #include "chrome/common/pref_names.h"

15 #include "webkit/plugins/npapi/mock_plugin_list.h"	15 #include "webkit/plugins/npapi/mock_plugin_list.h"

16	16

17 namespace extensions {	17 namespace extensions {

18	18

19 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentSettings) {	19 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentSettings) {

20 CommandLine::ForCurrentProcess()->AppendSwitch(	20 CommandLine::ForCurrentProcess()->AppendSwitch(

(...skipping 103 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
124	124

125 ContentSettingsGetResourceIdentifiersFunction::SetPluginsForTesting(&plugins);	125 ContentSettingsGetResourceIdentifiersFunction::SetPluginsForTesting(&plugins);

126	126

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

128 << message_;	128 << message_;

129	129

130 ContentSettingsGetResourceIdentifiersFunction::SetPluginsForTesting(NULL);	130 ContentSettingsGetResourceIdentifiersFunction::SetPluginsForTesting(NULL);

131 }	131 }

132	132

133 } // namespace extensions	133 } // namespace extensions

OLD	NEW