chrome/browser/renderer_host/plugin_info_message_filter_unittest.cc - Issue 9844016: Revert 129322 - revert 128949 (and dependent 129252)

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/renderer_host/plugin_info_message_filter_unittest.cc

Issue 9844016: Revert 129322 - revert 128949 (and dependent 129252) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 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 side-by-side diff with in-line comments

Download patch

Index: chrome/browser/renderer_host/plugin_info_message_filter_unittest.cc

===================================================================

--- chrome/browser/renderer_host/plugin_info_message_filter_unittest.cc (revision 129385)

+++ chrome/browser/renderer_host/plugin_info_message_filter_unittest.cc (working copy)

@@ -120,7 +120,7 @@

ChromeViewHostMsg_GetPluginInfo_Status status;

webkit::WebPluginInfo plugin;

std::string actual_mime_type;

- EXPECT_FALSE(context_.FindEnabledPlugin(

+ EXPECT_TRUE(context_.FindEnabledPlugin(

0, GURL(), GURL(), "foo/bar", &status, &plugin, &actual_mime_type));

EXPECT_EQ(ChromeViewHostMsg_GetPluginInfo_Status::kAllowed, status.value);

EXPECT_EQ(foo_plugin_path_.value(), plugin.path.value());

@@ -131,7 +131,7 @@

ChromeViewHostMsg_GetPluginInfo_Status status;

webkit::WebPluginInfo plugin;

std::string actual_mime_type;

- EXPECT_FALSE(context_.FindEnabledPlugin(

+ EXPECT_TRUE(context_.FindEnabledPlugin(

0, GURL(), GURL(), "foo/bar", &status, &plugin, &actual_mime_type));

EXPECT_EQ(ChromeViewHostMsg_GetPluginInfo_Status::kAllowed, status.value);

EXPECT_EQ(bar_plugin_path_.value(), plugin.path.value());

@@ -142,7 +142,7 @@

ChromeViewHostMsg_GetPluginInfo_Status status;

webkit::WebPluginInfo plugin;

std::string actual_mime_type;

- EXPECT_TRUE(context_.FindEnabledPlugin(

+ EXPECT_FALSE(context_.FindEnabledPlugin(

0, GURL(), GURL(), "foo/bar", &status, &plugin, &actual_mime_type));

EXPECT_EQ(ChromeViewHostMsg_GetPluginInfo_Status::kDisabled, status.value);

EXPECT_EQ(foo_plugin_path_.value(), plugin.path.value());

@@ -151,7 +151,7 @@

ChromeViewHostMsg_GetPluginInfo_Status status;

webkit::WebPluginInfo plugin;

std::string actual_mime_type;

- EXPECT_TRUE(context_.FindEnabledPlugin(

+ EXPECT_FALSE(context_.FindEnabledPlugin(

0, GURL(), GURL(), "baz/blurp", &status, &plugin, &actual_mime_type));

EXPECT_EQ(ChromeViewHostMsg_GetPluginInfo_Status::kNotFound, status.value);

EXPECT_EQ(FILE_PATH_LITERAL(""), plugin.path.value());

« no previous file with comments | « chrome/browser/renderer_host/plugin_info_message_filter.cc ('k') | chrome/browser/resources/plugins_linux.json » ('j') | no next file with comments »