Register surface namespace in BlimpUiContextFactory

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 ad4ce989bcb23375f7e9da906376c58caf736394..3150c8a774f1a6c4533d32ff975db4c34b21e5ad 100644
--- a/content/browser/compositor/surface_utils.cc
+++ b/content/browser/compositor/surface_utils.cc
@@ -19,11 +19,8 @@
 #include "third_party/skia/include/effects/SkLumaColorFilter.h"
 #include "ui/gfx/geometry/rect.h"
 
-#if defined(OS_ANDROID)
-#include "content/browser/renderer_host/compositor_impl_android.h"
-#else
+#if !defined(OS_ANDROID)
 #include "content/browser/compositor/image_transport_factory.h"
-#include "ui/compositor/compositor.h"
 #endif
 
 namespace {
@@ -161,24 +158,6 @@ void PrepareBitmapCopyOutputResult(
 
 namespace content {
 
-scoped_ptr<cc::SurfaceIdAllocator> CreateSurfaceIdAllocator() {
-#if defined(OS_ANDROID)
-  return CompositorImpl::CreateSurfaceIdAllocator();
-#else
-  ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
-  return factory->GetContextFactory()->CreateSurfaceIdAllocator();
-#endif
-}
-
-cc::SurfaceManager* GetSurfaceManager() {
-#if defined(OS_ANDROID)
-  return CompositorImpl::GetSurfaceManager();
-#else
-  ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
-  return factory->GetSurfaceManager();
-#endif
-}
-
 void CopyFromCompositingSurfaceHasResult(
     const gfx::Size& dst_size_in_pixel,
     const SkColorType color_type,