content/ui[Android]: Remove ContextProviderFactory.

content/browser/compositor/surface_utils.cc

Index: content/browser/compositor/surface_utils.cc
diff --git a/content/browser/compositor/surface_utils.cc b/content/browser/compositor/surface_utils.cc
index 27cceecf92514fc10ee382ef714af7668a9dcd51..d8ed873832b898d9caf7f5eef6bb8264a3734276 100644
--- a/content/browser/compositor/surface_utils.cc
+++ b/content/browser/compositor/surface_utils.cc
@@ -20,7 +20,7 @@
 #include "ui/gfx/geometry/rect.h"
 
 #if defined(OS_ANDROID)
-#include "content/browser/renderer_host/context_provider_factory_impl_android.h"
+#include "content/browser/renderer_host/compositor_impl_android.h"
 #else
 #include "content/browser/compositor/image_transport_factory.h"
 #include "ui/compositor/compositor.h"  // nogncheck
@@ -161,7 +161,7 @@ namespace content {
 
 cc::FrameSinkId AllocateFrameSinkId() {
 #if defined(OS_ANDROID)
-  return ContextProviderFactoryImpl::GetInstance()->AllocateFrameSinkId();
+  return CompositorImpl::AllocateFrameSinkId();
 #else
   ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
   return factory->GetContextFactoryPrivate()->AllocateFrameSinkId();
@@ -170,7 +170,7 @@ cc::FrameSinkId AllocateFrameSinkId() {
 
 cc::SurfaceManager* GetSurfaceManager() {
 #if defined(OS_ANDROID)
-  return ContextProviderFactoryImpl::GetInstance()->GetSurfaceManager();
+  return CompositorImpl::GetSurfaceManager();
 #else
   ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
   if (factory == NULL)