ozone: Move the factory interfaces into a common target.

ui/ozone/platform/caca/caca_surface_factory.cc

Index: ui/ozone/platform/caca/caca_surface_factory.cc
diff --git a/ui/ozone/platform/caca/caca_surface_factory.cc b/ui/ozone/platform/caca/caca_surface_factory.cc
index e8988d66612c34e40fac1e87dccfd24892c0b81a..58b5e640c9021633c83d02d0ab69e4ea4ed5c507 100644
--- a/ui/ozone/platform/caca/caca_surface_factory.cc
+++ b/ui/ozone/platform/caca/caca_surface_factory.cc
@@ -7,10 +7,10 @@
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkSurface.h"
-#include "ui/gfx/ozone/surface_ozone_canvas.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/vsync_provider.h"
 #include "ui/ozone/platform/caca/caca_connection.h"
+#include "ui/ozone/public/surface_ozone_canvas.h"
 
 namespace ui {
 
@@ -18,14 +18,14 @@ namespace {
 
 const gfx::AcceleratedWidget kDefaultWidgetHandle = 1;
 
-class CacaSurface : public gfx::SurfaceOzoneCanvas {
+class CacaSurface : public ui::SurfaceOzoneCanvas {
  public:
   CacaSurface(CacaConnection* connection);
   virtual ~CacaSurface();
 
   bool Initialize();
 
-  // gfx::SurfaceOzoneCanvas overrides:
+  // ui::SurfaceOzoneCanvas overrides:
   virtual skia::RefPtr<SkCanvas> GetCanvas() OVERRIDE;
   virtual void ResizeCanvas(const gfx::Size& viewport_size) OVERRIDE;
   virtual void PresentCanvas(const gfx::Rect& damage) OVERRIDE;
@@ -111,7 +111,7 @@ CacaSurfaceFactory::~CacaSurfaceFactory() {
     ShutdownHardware();
 }
 
-gfx::SurfaceFactoryOzone::HardwareState
+ui::SurfaceFactoryOzone::HardwareState
 CacaSurfaceFactory::InitializeHardware() {
   connection_->Initialize();
   state_ = INITIALIZED;
@@ -134,14 +134,14 @@ bool CacaSurfaceFactory::LoadEGLGLES2Bindings(
   return false;
 }
 
-scoped_ptr<gfx::SurfaceOzoneCanvas> CacaSurfaceFactory::CreateCanvasForWidget(
+scoped_ptr<ui::SurfaceOzoneCanvas> CacaSurfaceFactory::CreateCanvasForWidget(
     gfx::AcceleratedWidget widget) {
   CHECK_EQ(INITIALIZED, state_);
   CHECK_EQ(kDefaultWidgetHandle, widget);
 
   scoped_ptr<CacaSurface> canvas(new CacaSurface(connection_));
   CHECK(canvas->Initialize());
-  return canvas.PassAs<gfx::SurfaceOzoneCanvas>();
+  return canvas.PassAs<ui::SurfaceOzoneCanvas>();
 }
 
 }  // namespace ui