Remove WebGraphicsContext3D getter from cc::ContextProvider

cc/output/gl_renderer_unittest.cc

 // Copyright 2012 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 "cc/output/gl_renderer.h"
 
 #include <set>
 
 #include "cc/base/math_util.h"
 #include "cc/output/compositor_frame_metadata.h"
@@ skipping 161 matching lines @@
   using GLRenderer::IsBackbufferDiscarded;
   using GLRenderer::DoDrawQuad;
   using GLRenderer::BeginDrawingFrame;
   using GLRenderer::FinishDrawingQuadList;
   using GLRenderer::stencil_enabled;
 };
 
 class GLRendererWithDefaultHarnessTest : public GLRendererTest {
  protected:
   GLRendererWithDefaultHarnessTest() {
-    output_surface_ = FakeOutputSurface::Create3d(
-        TestWebGraphicsContext3D::Create()).Pass();
+    output_surface_ =
+        FakeOutputSurface::Create3d(TestWebGraphicsContext3D::Create()).Pass();
     CHECK(output_surface_->BindToClient(&output_surface_client_));
 
     resource_provider_ = ResourceProvider::Create(
         output_surface_.get(), NULL, 0, false, 1).Pass();
     renderer_ = make_scoped_ptr(new FakeRendererGL(&renderer_client_,
                                                    &settings_,
                                                    output_surface_.get(),
                                                    resource_provider_.get()));
   }
 
@@ skipping 544 matching lines @@
   Mock::VerifyAndClearExpectations(context);
 }
 
 class VisibilityChangeIsLastCallTrackingContext
     : public TestWebGraphicsContext3D {
  public:
   VisibilityChangeIsLastCallTrackingContext()
       : last_call_was_set_visibility_(false) {}
 
   // WebGraphicsContext3D methods.
-  virtual void flush() {
-    last_call_was_set_visibility_ = false;
-  }
-  virtual void deleteTexture(WebGLId) {
-    last_call_was_set_visibility_ = false;
-  }
+  virtual void flush() { last_call_was_set_visibility_ = false; }
+  virtual void deleteTexture(WebGLId) { last_call_was_set_visibility_ = false; }
   virtual void deleteFramebuffer(WebGLId) {
     last_call_was_set_visibility_ = false;
   }
   virtual void deleteQueryEXT(WebGLId) {
     last_call_was_set_visibility_ = false;
   }
   virtual void deleteRenderbuffer(WebGLId) {
     last_call_was_set_visibility_ = false;
   }
 
@@ skipping 16 matching lines @@
   VisibilityChangeIsLastCallTrackingContext* context = context_owned.get();
 
   scoped_refptr<TestContextProvider> provider = TestContextProvider::Create(
       context_owned.PassAs<TestWebGraphicsContext3D>());
 
   provider->support()->SetSurfaceVisibleCallback(base::Bind(
       &VisibilityChangeIsLastCallTrackingContext::set_last_call_was_visibility,
       base::Unretained(context)));
 
   FakeOutputSurfaceClient output_surface_client;
-  scoped_ptr<OutputSurface> output_surface(FakeOutputSurface::Create3d(
-        provider));
+  scoped_ptr<OutputSurface> output_surface(
+      FakeOutputSurface::Create3d(provider));
   CHECK(output_surface->BindToClient(&output_surface_client));
 
   scoped_ptr<ResourceProvider> resource_provider(
       ResourceProvider::Create(output_surface.get(), NULL, 0, false, 1));
 
   LayerTreeSettings settings;
   FakeRendererClient renderer_client;
   FakeRendererGL renderer(&renderer_client,
                           &settings,
                           output_surface.get(),
@@ skipping 890 matching lines @@
                        viewport_rect,
                        viewport_rect,
                        true,
                        false);
 
   TestSolidColorProgramAA();
 }
 
 class OutputSurfaceMockContext : public TestWebGraphicsContext3D {
  public:
-  OutputSurfaceMockContext() {
-    test_capabilities_.post_sub_buffer = true;
-  }
+  OutputSurfaceMockContext() { test_capabilities_.post_sub_buffer = true; }
 
   // Specifically override methods even if they are unused (used in conjunction
   // with StrictMock). We need to make sure that GLRenderer does not issue
   // framebuffer-related GL calls directly. Instead these are supposed to go
   // through the OutputSurface abstraction.
   MOCK_METHOD2(bindFramebuffer, void(WGC3Denum target, WebGLId framebuffer));
   MOCK_METHOD3(reshapeWithScaleFactor,
                void(int width, int height, float scale_factor));
   MOCK_METHOD4(drawElements,
                void(WGC3Denum mode,
@@ skipping 60 matching lines @@
                          NULL,
                          device_scale_factor,
                          device_viewport_rect,
                          device_viewport_rect,
                          true,
                          false);
   }
 
   OutputSurfaceMockContext* Context() {
     return static_cast<OutputSurfaceMockContext*>(
-        output_surface_.context_provider()->Context3d());
+        static_cast<TestContextProvider*>(
+            output_surface_.context_provider().get())->TestContext3d());
   }
 
   LayerTreeSettings settings_;
   FakeOutputSurfaceClient output_surface_client_;
   StrictMock<MockOutputSurface> output_surface_;
   scoped_ptr<ResourceProvider> resource_provider_;
   FakeRendererClient renderer_client_;
   scoped_ptr<FakeRendererGL> renderer_;
 };
 
@@ skipping 99 matching lines @@
   base::MessageLoop::current()->Run();
 
   // The sync point should have happened.
   EXPECT_EQ(1, sync_point_callback_count);
   EXPECT_EQ(1, other_callback_count);
 }
 #endif  // OS_ANDROID
 
 }  // namespace
 }  // namespace cc