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

ui/compositor/test/in_process_context_factory.cc

Index: ui/compositor/test/in_process_context_factory.cc
diff --git a/ui/compositor/test/in_process_context_factory.cc b/ui/compositor/test/in_process_context_factory.cc
index e47181415a4d55d30435e8160900f50f19957a6a..38119c46022c7820ac79eca97887371536ac5229 100644
--- a/ui/compositor/test/in_process_context_factory.cc
+++ b/ui/compositor/test/in_process_context_factory.cc
@@ -13,14 +13,13 @@
 #include "cc/surfaces/surface_id_allocator.h"
 #include "cc/test/pixel_test_output_surface.h"
 #include "cc/test/test_shared_bitmap_manager.h"
-#include "gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h"
 #include "gpu/command_buffer/client/context_support.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "ui/compositor/compositor_switches.h"
 #include "ui/compositor/reflector.h"
+#include "ui/compositor/test/in_process_context_provider.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface.h"
-#include "webkit/common/gpu/context_provider_in_process.h"
 
 namespace ui {
 namespace {
@@ -93,15 +92,9 @@ void InProcessContextFactory::CreateOutputSurface(
   attrs.shareResources = true;
   bool lose_context_when_out_of_memory = true;
 
-  using gpu_blink::WebGraphicsContext3DInProcessCommandBufferImpl;
-  scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> context3d(
-      WebGraphicsContext3DInProcessCommandBufferImpl::CreateViewContext(
-          attrs, lose_context_when_out_of_memory, compositor->widget()));
-  CHECK(context3d);
-
-  using webkit::gpu::ContextProviderInProcess;
-  scoped_refptr<ContextProviderInProcess> context_provider =
-      ContextProviderInProcess::Create(context3d.Pass(), "UICompositor");
+  scoped_refptr<InProcessContextProvider> context_provider =
+      InProcessContextProvider::Create(attrs, lose_context_when_out_of_memory,
+                                       compositor->widget(), "UICompositor");
 
   if (use_test_surface_) {
     bool flipped_output_surface = false;
@@ -129,9 +122,8 @@ InProcessContextFactory::SharedMainThreadContextProvider() {
     return shared_main_thread_contexts_;
 
   bool lose_context_when_out_of_memory = false;
-  shared_main_thread_contexts_ =
-      webkit::gpu::ContextProviderInProcess::CreateOffscreen(
-          lose_context_when_out_of_memory);
+  shared_main_thread_contexts_ = InProcessContextProvider::CreateOffscreen(
+      lose_context_when_out_of_memory);
   if (shared_main_thread_contexts_.get() &&
       !shared_main_thread_contexts_->BindToCurrentThread())
     shared_main_thread_contexts_ = NULL;