Use ContextProvider subclass to provide WGC3D pointers

content/renderer/webgraphicscontext3d_provider_impl.h

Index: content/renderer/webgraphicscontext3d_provider_impl.h
diff --git a/webkit/common/gpu/webgraphicscontext3d_provider_impl.h b/content/renderer/webgraphicscontext3d_provider_impl.h
similarity index 59%
rename from webkit/common/gpu/webgraphicscontext3d_provider_impl.h
rename to content/renderer/webgraphicscontext3d_provider_impl.h
index 794df1363ef85771a75ae03b79f91a56582899a2..7c06204042becb83196ce17358f80ea2a8e750d1 100644
--- a/webkit/common/gpu/webgraphicscontext3d_provider_impl.h
+++ b/content/renderer/webgraphicscontext3d_provider_impl.h
@@ -2,24 +2,27 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_PROVIDER_IMPL_H_
-#define WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_PROVIDER_IMPL_H_
+#ifndef CONTENT_RENDERER_WEBGRAPHICSCONTEXT3D_PROVIDER_IMPL_H_
+#define CONTENT_RENDERER_WEBGRAPHICSCONTEXT3D_PROVIDER_IMPL_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
+#include "content/common/content_export.h"
 #include "third_party/WebKit/public/platform/WebGraphicsContext3DProvider.h"
-#include "webkit/common/gpu/webkit_gpu_export.h"
-
-namespace cc { class ContextProvider; }
 
 namespace webkit {
 namespace gpu {
+class ContextProviderWebContext;
+}  // namespace webkit
+}  // namespace gpu
 
-class WEBKIT_GPU_EXPORT WebGraphicsContext3DProviderImpl
+namespace content {
+
+class CONTENT_EXPORT WebGraphicsContext3DProviderImpl
     : public NON_EXPORTED_BASE(blink::WebGraphicsContext3DProvider) {
  public:
   explicit WebGraphicsContext3DProviderImpl(
-      scoped_refptr<cc::ContextProvider> provider);
+      scoped_refptr<webkit::gpu::ContextProviderWebContext> provider);
   virtual ~WebGraphicsContext3DProviderImpl();
 
   // WebGraphicsContext3DProvider implementation.
@@ -27,10 +30,9 @@ class WEBKIT_GPU_EXPORT WebGraphicsContext3DProviderImpl
   virtual GrContext* grContext() OVERRIDE;
 
  private:
-  scoped_refptr<cc::ContextProvider> provider_;
+  scoped_refptr<webkit::gpu::ContextProviderWebContext> provider_;
 };
 
-}  // namespace gpu
-}  // namespace webkit
+}  // namespace content
 
-#endif  // WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_PROVIDER_IMPL_H_
+#endif  // CONTENT_RENDERER_WEBGRAPHICSCONTEXT3D_PROVIDER_IMPL_H_