chrome/browser/extensions/extension_content_settings_apitest.cc - Issue 7980011: Convert the PluginService interface to be an async wrapper around PluginList.

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/extension_content_settings_apitest.cc

Issue 7980011: Convert the PluginService interface to be an async wrapper around PluginList. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address comments Created 9 years, 3 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/extension_content_settings_api.cc ('k') | chrome/browser/metrics/metrics_service.h » ('j') | content/browser/plugin_service.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_content_settings_apitest.cc

diff --git a/chrome/browser/extensions/extension_content_settings_apitest.cc b/chrome/browser/extensions/extension_content_settings_apitest.cc

index 3294c23e777fe2f77382084b44ab589a18b6272d..aceaf7f7d7b422e585288b43841de7381236c01b 100644

--- a/chrome/browser/extensions/extension_content_settings_apitest.cc

+++ b/chrome/browser/extensions/extension_content_settings_apitest.cc

@@ -11,6 +11,7 @@

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

#include "chrome/common/chrome_switches.h"

#include "chrome/common/pref_names.h"

+#include "content/browser/plugin_service.h"

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

IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentSettings) {

@@ -117,10 +118,11 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest,

FilePath(kBarPath),

ASCIIToUTF16("2.3.4"),

ASCIIToUTF16("bar")));

- GetResourceIdentifiersFunction::SetPluginListForTesting(&plugin_list);

+ PluginService::GetInstance()->SetPluginListForTesting(&plugin_list);

EXPECT_TRUE(RunExtensionTest("content_settings/getresourceidentifiers"))

<< message_;

- GetResourceIdentifiersFunction::SetPluginListForTesting(NULL);

+ PluginService::GetInstance()->SetPluginListForTesting(NULL);

}