content/renderer/browser_plugin/browser_plugin_browsertest.cc - Issue 11091058: Reland r161256: Fix the crash that was happening on the buildbot (but not trybots, for a strange re…

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 11091058: Reland r161256: Fix the crash that was happening on the buildbot (but not trybots, for a strange re… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 8 years, 2 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: content/renderer/browser_plugin/browser_plugin_browsertest.cc

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

--- content/renderer/browser_plugin/browser_plugin_browsertest.cc (revision 161275)

+++ content/renderer/browser_plugin/browser_plugin_browsertest.cc (working copy)

@@ -14,7 +14,6 @@

#include "content/renderer/browser_plugin/mock_browser_plugin_manager.h"

#include "content/renderer/render_thread_impl.h"

#include "content/renderer/renderer_webkitplatformsupport_impl.h"

-#include "content/shell/shell_main_delegate.h"

#include "skia/ext/platform_canvas.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"

@@ -53,7 +52,6 @@

GetContentClient()->set_renderer_for_testing(&content_renderer_client_);

content::RenderViewTest::SetUp();

browser_plugin_manager_.reset(new MockBrowserPluginManager());

- content::ShellMainDelegate::InitializeResourceBundle();

}

void BrowserPluginTest::TearDown() {

« no previous file with comments | « content/public/test/render_view_test.cc ('k') | content/renderer/render_view_browsertest.cc » ('j') | no next file with comments »