Fix set_area sizes for RequestCopyOfOutput

content/browser/renderer_host/render_widget_host_view_browsertest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "content/browser/gpu/compositor_util.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
@@ skipping 761 matching lines @@
                                 output_size,
                                 expected_bitmap_size,
                                 video_frame);
 }
 
 class CompositingRenderWidgetHostViewTabCaptureHighDPI
     : public CompositingRenderWidgetHostViewBrowserTestTabCapture {
  public:
   CompositingRenderWidgetHostViewTabCaptureHighDPI() : kScale(2.f) {}
 
-  virtual void SetUpOnMainThread() OVERRIDE {
-    CommandLine* cmd = CommandLine::ForCurrentProcess();
+  virtual void SetUpCommandLine(base::CommandLine* cmd) OVERRIDE {
+    CompositingRenderWidgetHostViewBrowserTestTabCapture::SetUpCommandLine(cmd);
     cmd->AppendSwitchASCII(switches::kForceDeviceScaleFactor,
                            base::StringPrintf("%f", scale()));
-#if defined(OS_WIN)
     gfx::ForceHighDPISupportForTesting(scale());
     gfx::EnableHighDPISupport();
+  }
+
+  virtual void SetUpOnMainThread() OVERRIDE {
+#if defined(OS_WIN)
+    //    gfx::ForceHighDPISupportForTesting(scale());
+    //    gfx::EnableHighDPISupport();
 #endif
   }
 
   float scale() const { return kScale; }
 
  private:
   virtual bool ShouldContinueAfterTestURLLoad() OVERRIDE {
     // Short-circuit a pass for platforms where setting up high-DPI fails.
     if (ui::GetScaleForScaleFactor(ui::GetSupportedScaleFactor(
             GetScaleFactorForView(GetRenderWidgetHostView()))) != scale()) {
@@ skipping 58 matching lines @@
                         CompositingRenderWidgetHostViewBrowserTestTabCapture,
                         testing::ValuesIn(kAllCompositingModes));
 INSTANTIATE_TEST_CASE_P(GLAndSoftwareCompositing,
                         CompositingRenderWidgetHostViewTabCaptureHighDPI,
                         testing::ValuesIn(kAllCompositingModes));
 
 #endif  // !defined(OS_ANDROID) && !defined(OS_IOS)
 
 }  // namespace
 }  // namespace content