ozone: Build fixes for gbm & component build

ui/ozone/platform/dri/gbm_surface_factory.cc

Index: ui/ozone/platform/dri/gbm_surface_factory.cc
diff --git a/ui/ozone/platform/dri/gbm_surface_factory.cc b/ui/ozone/platform/dri/gbm_surface_factory.cc
index 5eb93fc427ee7cc6355427436f2bcaa356714786..9e9d3c4f68e567cb6369af327b6c4f019fe40f54 100644
--- a/ui/ozone/platform/dri/gbm_surface_factory.cc
+++ b/ui/ozone/platform/dri/gbm_surface_factory.cc
@@ -152,7 +152,7 @@ scoped_ptr<ui::SurfaceOzoneEGL> GbmSurfaceFactory::CreateEGLSurfaceForWidget(
       new GbmSurfaceAdapter(screen_manager_->GetDisplayController(w)));
 }
 
-gfx::NativeBufferOzone GbmSurfaceFactory::CreateNativeBuffer(
+ui::NativeBufferOzone GbmSurfaceFactory::CreateNativeBuffer(
     gfx::Size size,
     BufferFormat format) {
   uint32_t gbm_format = 0;
@@ -181,7 +181,7 @@ gfx::NativeBufferOzone GbmSurfaceFactory::CreateNativeBuffer(
   BufferData* data = BufferData::CreateData(drm_, buffer_object);
   DCHECK(data) << "Failed to associate the buffer with the controller";
 
-  return reinterpret_cast<gfx::NativeBufferOzone>(buffer_object);
+  return reinterpret_cast<ui::NativeBufferOzone>(buffer_object);
 }
 
 }  // namespace ui