content/browser/download/download_browsertest.cc - Issue 930243008: Enable NPAPI plugins if any plugin policies are set.

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: content/browser/download/download_browsertest.cc

Issue 930243008: Enable NPAPI plugins if any plugin policies are set. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix nits. fix failing test. Created 5 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/policy/chrome_browser_policy_connector.cc ('K') | « chrome/browser/policy/chrome_browser_policy_connector.cc ('k') | content/browser/plugin_service_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/download/download_browsertest.cc

diff --git a/content/browser/download/download_browsertest.cc b/content/browser/download/download_browsertest.cc

index a2e75241945c6ff6e12ccf3000f0db0c0fedb81d..b39e04eb3f944ed71eee45ad0a4c02f50a38e930 100644

--- a/content/browser/download/download_browsertest.cc

+++ b/content/browser/download/download_browsertest.cc

@@ -854,6 +854,7 @@ IN_PROC_BROWSER_TEST_F(DownloadContentTest, DownloadOctetStream) {

plugin_info.name = base::ASCIIToUTF16(kTestPluginName);

plugin_info.mime_types.push_back(

WebPluginMimeType(kTestMimeType, kTestFileType, ""));

+ plugin_info.type = WebPluginInfo::PLUGIN_TYPE_PEPPER_IN_PROCESS;

PluginServiceImpl::GetInstance()->RegisterInternalPlugin(plugin_info, false);

// The following is served with a Content-Type of application/octet-stream.