Remove unnecessary use of blink typedefs

cc/trees/layer_tree_host_impl_unittest.cc

 // Copyright 2011 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/trees/layer_tree_host_impl.h"
 
 #include <cmath>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 3511 matching lines @@
     quad_sink->Append(my_quad.PassAs<DrawQuad>(), append_quads_data);
   }
 
  private:
   FakeLayerWithQuads(LayerTreeImpl* tree_impl, int id)
       : LayerImpl(tree_impl, id) {}
 };
 
 class MockContext : public TestWebGraphicsContext3D {
  public:
-  MOCK_METHOD1(useProgram, void(blink::WebGLId program));
-  MOCK_METHOD5(uniform4f, void(blink::WGC3Dint location,
-                               blink::WGC3Dfloat x,
-                               blink::WGC3Dfloat y,
-                               blink::WGC3Dfloat z,
-                               blink::WGC3Dfloat w));
-  MOCK_METHOD4(uniformMatrix4fv, void(blink::WGC3Dint location,
-                                      blink::WGC3Dsizei count,
-                                      blink::WGC3Dboolean transpose,
-                                      const blink::WGC3Dfloat* value));
-  MOCK_METHOD4(drawElements, void(blink::WGC3Denum mode,
-                                  blink::WGC3Dsizei count,
-                                  blink::WGC3Denum type,
-                                  blink::WGC3Dintptr offset));
+  MOCK_METHOD1(useProgram, void(GLuint program));
+  MOCK_METHOD5(uniform4f, void(GLint location,
+                               GLfloat x,
+                               GLfloat y,
+                               GLfloat z,
+                               GLfloat w));
+  MOCK_METHOD4(uniformMatrix4fv, void(GLint location,
+                                      GLsizei count,
+                                      GLboolean transpose,
+                                      const GLfloat* value));
+  MOCK_METHOD4(drawElements, void(GLenum mode,
+                                  GLsizei count,
+                                  GLenum type,
+                                  GLintptr offset));
   MOCK_METHOD0(getRequestableExtensionsCHROMIUM, blink::WebString());
-  MOCK_METHOD1(enable, void(blink::WGC3Denum cap));
-  MOCK_METHOD1(disable, void(blink::WGC3Denum cap));
-  MOCK_METHOD4(scissor, void(blink::WGC3Dint x,
-                             blink::WGC3Dint y,
-                             blink::WGC3Dsizei width,
-                             blink::WGC3Dsizei height));
+  MOCK_METHOD1(enable, void(GLenum cap));
+  MOCK_METHOD1(disable, void(GLenum cap));
+  MOCK_METHOD4(scissor, void(GLint x,
+                             GLint y,
+                             GLsizei width,
+                             GLsizei height));
 };
 
 class MockContextHarness {
  private:
   MockContext* context_;
 
  public:
   explicit MockContextHarness(MockContext* context)
       : context_(context) {
     context_->set_have_post_sub_buffer(true);
@@ skipping 300 matching lines @@
 
   // Kill the layer tree.
   host_impl_->active_tree()->SetRootLayer(
       LayerImpl::Create(host_impl_->active_tree(), 100));
   // There should be no textures left in use after.
   EXPECT_EQ(0u, context3d->NumTextures());
 }
 
 class MockDrawQuadsToFillScreenContext : public TestWebGraphicsContext3D {
  public:
-  MOCK_METHOD1(useProgram, void(blink::WebGLId program));
-  MOCK_METHOD4(drawElements, void(blink::WGC3Denum mode,
-                                  blink::WGC3Dsizei count,
-                                  blink::WGC3Denum type,
-                                  blink::WGC3Dintptr offset));
+  MOCK_METHOD1(useProgram, void(GLuint program));
+  MOCK_METHOD4(drawElements, void(GLenum mode,
+                                  GLsizei count,
+                                  GLenum type,
+                                  GLintptr offset));
 };
 
 TEST_F(LayerTreeHostImplTest, HasTransparentBackground) {
   scoped_ptr<MockDrawQuadsToFillScreenContext> mock_context_owned(
       new MockDrawQuadsToFillScreenContext);
   MockDrawQuadsToFillScreenContext* mock_context = mock_context_owned.get();
 
   scoped_ptr<OutputSurface> output_surface(FakeOutputSurface::Create3d(
       mock_context_owned.PassAs<TestWebGraphicsContext3D>()));
 
@@ skipping 1544 matching lines @@
                                      &set_needs_redraw_count));
     // Empty damage rect won't signal the monitor.
     host_impl_->SetNeedsRedrawRect(gfx::Rect());
     EXPECT_EQ(0, set_needs_commit_count);
     EXPECT_EQ(2, set_needs_redraw_count);
   }
 }
 
 }  // namespace
 }  // namespace cc