chrome/browser/extensions/api/content_settings/content_settings_apitest.cc - Issue 12330089: JSON compiler to include "customBindings" in the function name.

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 12330089: JSON compiler to include "customBindings" in the function name. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/

Patch Set: Created 7 years, 9 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/declarative/declarative_api.h » ('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/utf_string_conversions.h"	6 #include "base/utf_string_conversions.h"

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

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

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

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

(...skipping 104 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
115 ASCIIToUTF16("foo")));	115 ASCIIToUTF16("foo")));

116 plugin_list.AddPluginToLoad(	116 plugin_list.AddPluginToLoad(

117 webkit::WebPluginInfo(ASCIIToUTF16(kBarName),	117 webkit::WebPluginInfo(ASCIIToUTF16(kBarName),

118 base::FilePath(kBarPath),	118 base::FilePath(kBarPath),

119 ASCIIToUTF16("2.3.4"),	119 ASCIIToUTF16("2.3.4"),

120 ASCIIToUTF16("bar")));	120 ASCIIToUTF16("bar")));

121	121

122 std::vector<webkit::WebPluginInfo> plugins;	122 std::vector<webkit::WebPluginInfo> plugins;

123 plugin_list.GetPlugins(&plugins);	123 plugin_list.GetPlugins(&plugins);

124	124

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

	126 SetPluginsForTesting(&plugins);

126	127

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

128 << message_;	129 << message_;

129	130

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

	132 SetPluginsForTesting(NULL);

131 }	133 }

132	134

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

OLD	NEW