Revert of RenderWidgetCompositor should be decoupled from RenderWidget.

content/renderer/gpu/render_widget_compositor_unittest.cc

 // Copyright 2014 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 "content/renderer/gpu/render_widget_compositor.h"
 
 #include <utility>
 
 #include "base/location.h"
 #include "base/macros.h"
@@ skipping 44 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(TestRenderWidget);
 };
 
 int TestRenderWidget::next_routing_id_ = 0;
 
 class RenderWidgetCompositorTest : public testing::Test {
  public:
   RenderWidgetCompositorTest()
       : compositor_deps_(new FakeCompositorDependencies),
         render_widget_(new TestRenderWidget(compositor_deps_.get())),
-        render_widget_compositor_(RenderWidgetCompositor::Create(
-            render_widget_.get(),
-            1.f /* initial_device_scale_factor */,
-            compositor_deps_.get())) {}
+        render_widget_compositor_(
+            RenderWidgetCompositor::Create(render_widget_.get(),
+                                           compositor_deps_.get())) {}
   ~RenderWidgetCompositorTest() override {}
 
  protected:
   base::MessageLoop loop_;
   MockRenderThread render_thread_;
   scoped_ptr<FakeCompositorDependencies> compositor_deps_;
   scoped_refptr<TestRenderWidget> render_widget_;
   scoped_ptr<RenderWidgetCompositor> render_widget_compositor_;
 
  private:
@@ skipping 158 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetCompositorOutputSurface);
 };
 
 class RenderWidgetCompositorOutputSurfaceTest : public testing::Test {
  public:
   RenderWidgetCompositorOutputSurfaceTest()
       : compositor_deps_(new FakeCompositorDependencies),
         render_widget_(new RenderWidgetOutputSurface(compositor_deps_.get())) {
     render_widget_compositor_.reset(new RenderWidgetCompositorOutputSurface(
         render_widget_.get(), compositor_deps_.get()));
-    render_widget_compositor_->Initialize(
-        1.f /* initial_device_scale_factor */);
+    render_widget_compositor_->Initialize();
     render_widget_->SetCompositor(render_widget_compositor_.get());
   }
 
   void RunTest(bool use_null_output_surface,
                int num_failures_before_success,
                int expected_successes,
                int expected_fallback_succeses) {
     render_widget_compositor_->SetUp(
         use_null_output_surface, num_failures_before_success,
         expected_successes, expected_fallback_succeses);
@@ skipping 60 matching lines @@
 }
 
 TEST_F(RenderWidgetCompositorOutputSurfaceTest, FallbackSuccessNormalSuccess) {
   // The first success is a fallback, but the next should not be a fallback.
   RunTest(false, RenderWidgetCompositor::OUTPUT_SURFACE_RETRIES_BEFORE_FALLBACK,
           1, 1);
 }
 
 }  // namespace
 }  // namespace content