Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1364)

Unified Diff: content/browser/renderer_host/render_widget_host_view_browsertest.cc

Issue 190663012: Run ContentMain in a browser_test's browser process. This removes duplication of code in the browse… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: try to fix android by restoring old path just for it Created 6 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
« no previous file with comments | « content/browser/renderer_host/render_widget_host_browsertest.cc ('k') | content/content_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_widget_host_view_browsertest.cc
===================================================================
--- content/browser/renderer_host/render_widget_host_view_browsertest.cc (revision 257432)
+++ content/browser/renderer_host/render_widget_host_view_browsertest.cc (working copy)
@@ -74,9 +74,8 @@
callback_invoke_count_(0),
frames_captured_(0) {}
- virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+ virtual void SetUpOnMainThread() OVERRIDE {
ASSERT_TRUE(PathService::Get(DIR_TEST_DATA, &test_dir_));
- ContentBrowserTest::SetUpInProcessBrowserTestFixture();
}
// Attempts to set up the source surface. Returns false if unsupported on the
@@ -875,8 +874,8 @@
public:
CompositingRenderWidgetHostViewTabCaptureHighDPI() : kScale(2.f) {}
- virtual void SetUpCommandLine(CommandLine* cmd) OVERRIDE {
- CompositingRenderWidgetHostViewBrowserTestTabCapture::SetUpCommandLine(cmd);
+ virtual void SetUpOnMainThread() OVERRIDE {
+ CommandLine* cmd = CommandLine::ForCurrentProcess();
cmd->AppendSwitchASCII(switches::kForceDeviceScaleFactor,
base::StringPrintf("%f", scale()));
#if defined(OS_WIN)
« no previous file with comments | « content/browser/renderer_host/render_widget_host_browsertest.cc ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698