content/renderer/browser_plugin/browser_plugin_browsertest.cc - Issue 10700117: Replaced static URLRequestFileJob factory with non-static protocol handler for File jobs

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/renderer/browser_plugin/browser_plugin_browsertest.cc

Issue 10700117: Replaced static URLRequestFileJob factory with non-static protocol handler for File jobs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed merge 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/ui/webui/chrome_url_data_manager_backend.cc ('K') | « chrome/browser/ui/webui/chrome_url_data_manager_backend.cc ('k') | content/test/net/url_request_mock_http_job.cc » ('j') | net/url_request/file_protocol_handler.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/browser_plugin/browser_plugin_browsertest.cc

diff --git a/content/renderer/browser_plugin/browser_plugin_browsertest.cc b/content/renderer/browser_plugin/browser_plugin_browsertest.cc

index 7afdd9a8102c0d1f173f0c5d72d52d93b2981c1e..0e1fa0e464bf06198b326504f65d1fdcb0d13946 100644

--- a/content/renderer/browser_plugin/browser_plugin_browsertest.cc

+++ b/content/renderer/browser_plugin/browser_plugin_browsertest.cc

@@ -87,7 +87,7 @@ TEST_F(BrowserPluginTest, InitialResize) {

EXPECT_EQ(480, params.height);

// Verify that the browser plugin wasn't already waiting on a resize when this

// resize happened.

- EXPECT_FALSE(params.resize_pending);

+ EXPECT_EQ(false, params.resize_pending);

mmenke 2012/08/15 14:57:16 Why this change? Doesn't seem to belong in this C

shalev 2012/08/15 21:23:41 Oops, this change is not supposed to be here (it w

MockBrowserPlugin* browser_plugin =

static_cast<MockBrowserPlugin*>(