ozone: Build fixes for gbm & component build

ui/ozone/platform/dri/gbm_surface_factory.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/ozone/platform/dri/gbm_surface_factory.h"
 
 #include <EGL/egl.h>
 #include <gbm.h>
 
 #include "base/files/file_path.h"
@@ skipping 134 matching lines @@
 
 scoped_ptr<ui::SurfaceOzoneEGL> GbmSurfaceFactory::CreateEGLSurfaceForWidget(
     gfx::AcceleratedWidget w) {
   CHECK(state_ == INITIALIZED);
   ResetCursor(w);
 
   return scoped_ptr<ui::SurfaceOzoneEGL>(
       new GbmSurfaceAdapter(screen_manager_->GetDisplayController(w)));
 }
 
-gfx::NativeBufferOzone GbmSurfaceFactory::CreateNativeBuffer(
+ui::NativeBufferOzone GbmSurfaceFactory::CreateNativeBuffer(
     gfx::Size size,
     BufferFormat format) {
   uint32_t gbm_format = 0;
   switch (format) {
     case SurfaceFactoryOzone::UNKNOWN:
       return 0;
     // TODO(alexst): Setting this to XRGB for now to allow presentation
     // as a primary plane but disallowing overlay transparency. Address this
     // to allow both use cases.
     case SurfaceFactoryOzone::RGBA_8888:
       gbm_format = GBM_FORMAT_XRGB8888;
       break;
     case SurfaceFactoryOzone::RGB_888:
       gbm_format = GBM_FORMAT_RGB888;
       break;
   }
   gbm_bo* buffer_object =
       gbm_bo_create(device_,
                     size.width(),
                     size.height(),
                     gbm_format,
                     GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING);
   if (!buffer_object)
     return 0;
 
   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