chrome/browser/extensions/api/content_settings/content_settings_apitest.cc - Issue 11747025: Run the JSON Schema Compiler's bundle compilation on JSON files. Previously it

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

Unified Diff: chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

Issue 11747025: Run the JSON Schema Compiler's bundle compilation on JSON files. Previously it (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix ms release build Created 7 years, 11 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/api/content_settings/content_settings_api.cc ('k') | chrome/browser/extensions/api/context_menu/context_menu_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

diff --git a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

index 69227d1d8bb52a08e466f05d2ebf78d9db3c633e..381346eaa943ce8033d04f559b3be88e7696475b 100644

--- a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

+++ b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

@@ -3,9 +3,9 @@

// found in the LICENSE file.

#include "base/utf_string_conversions.h"

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

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

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

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

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

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

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

@@ -120,12 +120,12 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest,

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

plugin_list.GetPlugins(&plugins);

- GetResourceIdentifiersFunction::SetPluginsForTesting(&plugins);

+ ContentSettingsGetResourceIdentifiersFunction::SetPluginsForTesting(&plugins);

EXPECT_TRUE(RunExtensionTest("content_settings/getresourceidentifiers"))

<< message_;

- GetResourceIdentifiersFunction::SetPluginsForTesting(NULL);

+ ContentSettingsGetResourceIdentifiersFunction::SetPluginsForTesting(NULL);

}

} // namespace extensions