content: Add ContextProviderFactory to create a render ContextProvider.

content/browser/renderer_host/render_widget_host_view_android.cc

Index: content/browser/renderer_host/render_widget_host_view_android.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
index b24c300e752f01801ee6a52ba40cc18acb143f33..b7bec912f43241beac064f4529945a3630f33d04 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.cc
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -76,6 +76,7 @@
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 #include "third_party/skia/include/core/SkCanvas.h"
+#include "ui/android/context_provider_factory.h"
 #include "ui/android/window_android.h"
 #include "ui/android/window_android_compositor.h"
 #include "ui/base/layout.h"
@@ -290,7 +291,8 @@ scoped_refptr<cc::SurfaceLayer> CreateSurfaceLayer(
     const cc::SurfaceId& surface_id,
     const gfx::Size& size) {
   DCHECK(!surface_id.is_null());
-  cc::SurfaceManager* manager = CompositorImpl::GetSurfaceManager();
+  cc::SurfaceManager* manager =
+      ui::ContextProviderFactory::GetInstance()->GetSurfaceManager();
   DCHECK(manager);
   // manager must outlive compositors using it.
   scoped_refptr<cc::SurfaceLayer> surface_layer = cc::SurfaceLayer::Create(
@@ -345,10 +347,11 @@ RenderWidgetHostViewAndroid::RenderWidgetHostViewAndroid(
       locks_on_frame_count_(0),
       observing_root_window_(false),
       weak_ptr_factory_(this) {
-  id_allocator_.reset(
-      new cc::SurfaceIdAllocator(CompositorImpl::AllocateSurfaceClientId()));
-  CompositorImpl::GetSurfaceManager()->RegisterSurfaceClientId(
-      id_allocator_->client_id());
+  id_allocator_.reset(new cc::SurfaceIdAllocator(

[no sievers, 2016/08/02 20:44:34]

This can probably all be behind |using_browser_compositor_| to not allocate
anything in WebView.

[Khushal, 2016/08/02 22:22:16]

Done.

+      ui::ContextProviderFactory::GetInstance()->AllocateSurfaceClientId()));
+  ui::ContextProviderFactory::GetInstance()
+      ->GetSurfaceManager()
+      ->RegisterSurfaceClientId(id_allocator_->client_id());
   host_->SetView(this);
   SetContentViewCore(content_view_core);
 }
@@ -798,8 +801,9 @@ void RenderWidgetHostViewAndroid::Destroy() {
     surface_id_ = cc::SurfaceId();
   }
   surface_factory_.reset();
-  CompositorImpl::GetSurfaceManager()->InvalidateSurfaceClientId(
-      id_allocator_->client_id());
+  ui::ContextProviderFactory::GetInstance()
+      ->GetSurfaceManager()
+      ->InvalidateSurfaceClientId(id_allocator_->client_id());
 
   // The RenderWidgetHost's destruction led here, so don't call it.
   host_ = NULL;
@@ -976,7 +980,8 @@ void RenderWidgetHostViewAndroid::CheckOutputSurfaceChanged(
 
 void RenderWidgetHostViewAndroid::SubmitCompositorFrame(
     cc::CompositorFrame frame) {
-  cc::SurfaceManager* manager = CompositorImpl::GetSurfaceManager();
+  cc::SurfaceManager* manager =
+      ui::ContextProviderFactory::GetInstance()->GetSurfaceManager();
   if (!surface_factory_) {
     surface_factory_ = base::WrapUnique(new cc::SurfaceFactory(manager, this));
   }
@@ -1013,7 +1018,6 @@ void RenderWidgetHostViewAndroid::InternalSwapCompositorFrame(
     cc::CompositorFrame frame) {
   last_scroll_offset_ = frame.metadata.root_scroll_offset;
   DCHECK(frame.delegated_frame_data);
-  DCHECK(CompositorImpl::GetSurfaceManager());
 
   if (locks_on_frame_count_ > 0) {
     DCHECK(HasValidFrame());