cc: Inline GLRenderer::Initialize into the constructor

Since the method can no longer fail, no reason to delay it and force
unit tests to all call it.

Depends on: https://codereview.chromium.org/107193003/

R=jamesr
BUG=

Review URL: https://codereview.chromium.org/108313003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239540 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 8 insertions, 39 deletions

diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc
index a910cb3..b131df0 100644
--- a/cc/output/gl_renderer.cc
+++ b/cc/output/gl_renderer.cc
@@ -150,14 +150,12 @@ scoped_ptr<GLRenderer> GLRenderer::Create(
     ResourceProvider* resource_provider,
     TextureMailboxDeleter* texture_mailbox_deleter,
     int highp_threshold_min) {
-  scoped_ptr<GLRenderer> renderer(new GLRenderer(client,
-                                                 settings,
-                                                 output_surface,
-                                                 resource_provider,
-                                                 texture_mailbox_deleter,
-                                                 highp_threshold_min));
-  renderer->Initialize();
-  return renderer.Pass();
+  return make_scoped_ptr(new GLRenderer(client,
+                                        settings,
+                                        output_surface,
+                                        resource_provider,
+                                        texture_mailbox_deleter,
+                                        highp_threshold_min));
 }
 
 GLRenderer::GLRenderer(RendererClient* client,
@@ -184,9 +182,7 @@ GLRenderer::GLRenderer(RendererClient* client,
       on_demand_tile_raster_resource_id_(0) {
   DCHECK(context_);
   DCHECK(context_support_);
-}
 
-void GLRenderer::Initialize() {
   ContextProvider::Capabilities context_caps =
     output_surface_->context_provider()->ContextCapabilities();
 
diff --git a/cc/output/gl_renderer.h b/cc/output/gl_renderer.h
index c1daec9..e1603ba 100644
--- a/cc/output/gl_renderer.h
+++ b/cc/output/gl_renderer.h
@@ -90,7 +90,6 @@ class CC_EXPORT GLRenderer : public DirectRenderer {
              int highp_threshold_min);
 
   bool IsBackbufferDiscarded() const { return is_backbuffer_discarded_; }
-  void Initialize();
   void InitializeGrContext();
 
   const gfx::QuadF& SharedGeometryQuad() const { return shared_geometry_quad_; }
diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc
index a83809d..1760bc5 100644
--- a/cc/output/gl_renderer_unittest.cc
+++ b/cc/output/gl_renderer_unittest.cc
@@ -208,7 +208,6 @@ class FakeRendererGL : public GLRenderer {
   // GLRenderer methods.
 
   // Changing visibility to public.
-  using GLRenderer::Initialize;
   using GLRenderer::IsBackbufferDiscarded;
   using GLRenderer::DoDrawQuad;
   using GLRenderer::BeginDrawingFrame;
@@ -234,8 +233,6 @@ class GLRendererTest : public testing::Test {
                                                    resource_provider_.get()));
   }
 
-  virtual void SetUp() { renderer_->Initialize(); }
-
   void SwapBuffers() { renderer_->SwapBuffers(CompositorFrameMetadata()); }
 
   LayerTreeSettings settings_;
@@ -264,7 +261,6 @@ class GLRendererShaderTest : public testing::Test {
                                        &settings_,
                                        output_surface_.get(),
                                        resource_provider_.get()));
-    renderer_->Initialize();
   }
 
   void TestRenderPassProgram(TexCoordPrecision precision) {
@@ -578,8 +574,6 @@ TEST(GLRendererTest2, InitializationDoesNotMakeSynchronousCalls) {
                           &settings,
                           output_surface.get(),
                           resource_provider.get());
-
-  renderer.Initialize();
 }
 
 class LoseContextOnFirstGetContext : public TestWebGraphicsContext3D {
@@ -614,8 +608,6 @@ TEST(GLRendererTest2, InitializationWithQuicklyLostContextDoesNotAssert) {
                           &settings,
                           output_surface.get(),
                           resource_provider.get());
-
-  renderer.Initialize();
 }
 
 class ClearCountingContext : public TestWebGraphicsContext3D {
@@ -652,8 +644,6 @@ TEST(GLRendererTest2, OpaqueBackground) {
 
   renderer_client.root_render_pass()->has_transparent_background = false;
 
-  renderer.Initialize();
-
   // On DEBUG builds, render passes with opaque background clear to blue to
   // easily see regions that were not drawn on the screen.
   EXPECT_CALL(*context, discardFramebufferEXT(GL_FRAMEBUFFER, _, _))
@@ -690,8 +680,6 @@ TEST(GLRendererTest2, TransparentBackground) {
 
   renderer_client.root_render_pass()->has_transparent_background = true;
 
-  renderer.Initialize();
-
   EXPECT_CALL(*context, discardFramebufferEXT(GL_FRAMEBUFFER, 1, _))
       .Times(1);
   EXPECT_CALL(*context, clear(_)).Times(1);
@@ -720,8 +708,6 @@ TEST(GLRendererTest2, OffscreenOutputSurface) {
                           output_surface.get(),
                           resource_provider.get());
 
-  renderer.Initialize();
-
   EXPECT_CALL(*context, discardFramebufferEXT(GL_FRAMEBUFFER, _, _))
       .With(Args<2, 1>(ElementsAre(GL_COLOR_ATTACHMENT0)))
       .Times(1);
@@ -800,8 +786,6 @@ TEST(GLRendererTest2, VisibilityChangeIsLastCall) {
                           output_surface.get(),
                           resource_provider.get());
 
-  renderer.Initialize();
-
   // Ensure that the call to SetSurfaceVisible is the last call issue to the
   // GPU process, after glFlush is called, and after the RendererClient's
   // SetManagedMemoryPolicy is called. Plumb this tracking between both the
@@ -862,7 +846,6 @@ TEST(GLRendererTest2, ActiveTextureState) {
 
   // During initialization we are allowed to set any texture parameters.
   EXPECT_CALL(*context, texParameteri(_, _, _)).Times(AnyNumber());
-  renderer.Initialize();
 
   cc::RenderPass::Id id(1, 1);
   scoped_ptr<TestRenderPass> pass = TestRenderPass::Create();
@@ -948,7 +931,6 @@ TEST(GLRendererTest2, ShouldClearRootRenderPass) {
                           &settings,
                           output_surface.get(),
                           resource_provider.get());
-  renderer.Initialize();
 
   gfx::Rect viewport_rect(renderer_client.DeviceViewport());
   ScopedPtrVector<RenderPass>& render_passes =
@@ -1034,7 +1016,6 @@ TEST(GLRendererTest2, ScissorTestWhenClearing) {
                           &settings,
                           output_surface.get(),
                           resource_provider.get());
-  renderer.Initialize();
   EXPECT_FALSE(renderer.Capabilities().using_partial_swap);
 
   gfx::Rect viewport_rect(renderer_client.DeviceViewport());
@@ -1123,7 +1104,6 @@ TEST(GLRendererTest2, NoDiscardOnPartialUpdates) {
                           &settings,
                           output_surface.get(),
                           resource_provider.get());
-  renderer.Initialize();
   EXPECT_TRUE(renderer.Capabilities().using_partial_swap);
 
   gfx::Rect viewport_rect(renderer_client.DeviceViewport());
@@ -1301,7 +1281,6 @@ TEST(GLRendererTest2, ScissorAndViewportWithinNonreshapableSurface) {
                           &settings,
                           output_surface.get(),
                           resource_provider.get());
-  renderer.Initialize();
   EXPECT_FALSE(renderer.Capabilities().using_partial_swap);
 
   gfx::Rect viewport_rect(renderer_client.DeviceViewport().size());
@@ -1648,7 +1627,6 @@ class MockOutputSurfaceTest : public testing::Test, public FakeRendererClient {
 
     renderer_.reset(new FakeRendererGL(
         this, &settings_, &output_surface_, resource_provider_.get()));
-    renderer_->Initialize();
   }
 
   void SwapBuffers() { renderer_->SwapBuffers(CompositorFrameMetadata()); }
diff --git a/cc/test/test_web_graphics_context_3d.h b/cc/test/test_web_graphics_context_3d.h
index b74a6be..8ad285a 100644
--- a/cc/test/test_web_graphics_context_3d.h
+++ b/cc/test/test_web_graphics_context_3d.h
@@ -165,9 +165,7 @@ class TestWebGraphicsContext3D : public FakeWebGraphicsContext3D {
     return test_capabilities_;
   }
 
-  void set_context_lost(bool context_lost) {
-    context_lost_ = context_lost;
-  }
+  void set_context_lost(bool context_lost) { context_lost_ = context_lost; }
   void set_times_bind_texture_succeeds(int times) {
     times_bind_texture_succeeds_ = times;
   }
diff --git a/cc/trees/layer_tree_host_unittest_context.cc b/cc/trees/layer_tree_host_unittest_context.cc
index 5500a8c..7112436 100644
--- a/cc/trees/layer_tree_host_unittest_context.cc
+++ b/cc/trees/layer_tree_host_unittest_context.cc
@@ -219,9 +219,7 @@ class LayerTreeHostContextTestLostContextSucceeds
     recovered_context_ = true;
   }
 
-  virtual void AfterTest() OVERRIDE {
-    EXPECT_EQ(9u, test_case_);
-  }
+  virtual void AfterTest() OVERRIDE { EXPECT_EQ(9u, test_case_); }
 
   virtual void DidCommitAndDrawFrame() OVERRIDE {
     // If the last frame had a context loss, then we'll commit again to