ui/compositor: Provide its own 'in process' ContextProvider.

ui/compositor/test/in_process_context_provider.h

Index: ui/compositor/test/in_process_context_provider.h
diff --git a/webkit/common/gpu/context_provider_in_process.h b/ui/compositor/test/in_process_context_provider.h
similarity index 76%
copy from webkit/common/gpu/context_provider_in_process.h
copy to ui/compositor/test/in_process_context_provider.h
index e3c9ea1e34b79770b0e146b9480466bfab811c41..cdf4abe9f4d637b7b5ceb6a00d6a68681f7c5010 100644
--- a/webkit/common/gpu/context_provider_in_process.h
+++ b/ui/compositor/test/in_process_context_provider.h
@@ -11,40 +11,32 @@
 #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 "webkit/common/gpu/webkit_gpu_export.h"
-
-namespace blink { class WebGraphicsContext3D; }
+#include "cc/output/context_provider.h"
 
 namespace gpu_blink {
 class WebGraphicsContext3DInProcessCommandBufferImpl;
 }
 
-namespace webkit {
-namespace gpu {
+namespace ui {
 class GrContextForWebGraphicsContext3D;
 
-class WEBKIT_GPU_EXPORT ContextProviderInProcess
-    : NON_EXPORTED_BASE(public ContextProviderWebContext) {
+class InProcessContextProvider : public cc::ContextProvider {
  public:
-  static scoped_refptr<ContextProviderInProcess> Create(
+  static scoped_refptr<InProcessContextProvider> Create(
       scoped_ptr<gpu_blink::WebGraphicsContext3DInProcessCommandBufferImpl>
           context3d,
       const std::string& debug_name);
 
   // Uses default attributes for creating an offscreen context.
-  static scoped_refptr<ContextProviderInProcess> CreateOffscreen(
+  static scoped_refptr<InProcessContextProvider> CreateOffscreen(
       bool lose_context_when_out_of_memory);
 
  private:
-  ContextProviderInProcess(
+  InProcessContextProvider(
       scoped_ptr<gpu_blink::WebGraphicsContext3DInProcessCommandBufferImpl>
           context3d,
       const std::string& debug_name);
-  ~ContextProviderInProcess() override;
-
-  // ContextProviderWebContext:
-  blink::WebGraphicsContext3D* WebContext3D() override;
+  ~InProcessContextProvider() override;
 
   // cc::ContextProvider:
   bool BindToCurrentThread() override;
@@ -83,10 +75,9 @@ class WEBKIT_GPU_EXPORT ContextProviderInProcess
 
   cc::ContextProvider::Capabilities capabilities_;
 
-  DISALLOW_COPY_AND_ASSIGN(ContextProviderInProcess);
+  DISALLOW_COPY_AND_ASSIGN(InProcessContextProvider);
 };
 
-}  // namespace gpu
-}  // namespace webkit
+}  // namespace ui
 
 #endif  // WEBKIT_COMMON_GPU_CONTEXT_PROVIDER_IN_PROCESS_H_