chrome/browser/extensions/api/content_settings/content_settings_apitest.cc - Issue 10876083: [4] Changing content_settings_api to use PluginFinder's async interface

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 10876083: [4] Changing content_settings_api to use PluginFinder's async interface (Closed) Base URL: http://git.chromium.org/chromium/src.git@async_start

Patch Set: Addressed review comments by Mattias Created 8 years, 4 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

« chrome/browser/extensions/api/content_settings/content_settings_api.cc ('K') | « chrome/browser/extensions/api/content_settings/content_settings_api.cc ('k') | no next file » | 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 8dc534f2bea4a0410d46ca2b4c38dd1e8591bb14..94afa0a04ee1e6ffbc63652917faa05755d120b2 100644

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

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

@@ -104,12 +104,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest,

FilePath::CharType kBarPath[] = FILE_PATH_LITERAL("/plugins/bar.plugin");

const char* kFooName = "Foo Plugin";

const char* kBarName = "Bar Plugin";

- const webkit::npapi::PluginGroupDefinition kPluginDefinitions[] = {

- { "foo", "Foo", kFooName },

- };

- webkit::npapi::MockPluginList plugin_list(kPluginDefinitions,

- arraysize(kPluginDefinitions));

+ webkit::npapi::MockPluginList plugin_list(NULL, 0);

plugin_list.AddPluginToLoad(

webkit::WebPluginInfo(ASCIIToUTF16(kFooName),

FilePath(kFooPath),

@@ -121,15 +117,15 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest,

ASCIIToUTF16("2.3.4"),

ASCIIToUTF16("bar")));

- std::vector<webkit::npapi::PluginGroup> groups;

- plugin_list.GetPluginGroups(true, &groups);

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

+ plugin_list.GetPlugins(&plugins);

- GetResourceIdentifiersFunction::SetPluginGroupsForTesting(&groups);

+ GetResourceIdentifiersFunction::SetPluginsForTesting(&plugins);

EXPECT_TRUE(RunExtensionTest("content_settings/getresourceidentifiers"))

<< message_;

- GetResourceIdentifiersFunction::SetPluginGroupsForTesting(NULL);

+ GetResourceIdentifiersFunction::SetPluginsForTesting(NULL);

}

} // namespace extensions