Revert 244383 "Use ContextProvider subclass to provide WGC3D poi..."

trunk/src/webkit/common/gpu/context_provider_in_process.h

Index: trunk/src/webkit/common/gpu/context_provider_in_process.h
===================================================================
--- trunk/src/webkit/common/gpu/context_provider_in_process.h	(revision 244469)
+++ trunk/src/webkit/common/gpu/context_provider_in_process.h	(working copy)
@@ -9,7 +9,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
-#include "webkit/common/gpu/context_provider_web_context.h"
+#include "cc/output/context_provider.h"
 #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
 #include "webkit/common/gpu/webkit_gpu_export.h"
 
@@ -20,7 +20,7 @@
 class GrContextForWebGraphicsContext3D;
 
 class WEBKIT_GPU_EXPORT ContextProviderInProcess
-    : NON_EXPORTED_BASE(public ContextProviderWebContext) {
+    : NON_EXPORTED_BASE(public cc::ContextProvider) {
  public:
   static scoped_refptr<ContextProviderInProcess> Create(
       scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> context3d,
@@ -30,7 +30,6 @@
   // context.
   static scoped_refptr<ContextProviderInProcess> CreateOffscreen();
 
-  virtual blink::WebGraphicsContext3D* WebContext3D() OVERRIDE;
   virtual bool BindToCurrentThread() OVERRIDE;
   virtual Capabilities ContextCapabilities() OVERRIDE;
   virtual blink::WebGraphicsContext3D* Context3d() OVERRIDE;