Break //ui/gl/ dependency on //ui/ozone.

services/ui/gles2/command_buffer_driver.cc

 // Copyright 2013 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 "services/ui/gles2/command_buffer_driver.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 17 matching lines @@
 #include "services/ui/gles2/gpu_state.h"
 #include "ui/gfx/buffer_format_util.h"
 #include "ui/gfx/gpu_memory_buffer.h"
 #include "ui/gfx/vsync_provider.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_image_shared_memory.h"
 #include "ui/gl/gl_surface.h"
 #include "ui/gl/init/gl_factory.h"
 
 #if defined(USE_OZONE)
-#include "ui/gl/gl_image_ozone_native_pixmap.h"
+#include "ui/ozone/gl/gl_image_ozone_native_pixmap.h"
 #endif
 
 namespace ui {
 
 namespace {
 
 // The first time polling a fence, delay some extra time to allow other
 // stubs to process some work, or else the timing of the fences could
 // allow a pattern of alternating fast and slow frames to occur.
 const int64_t kHandleMoreWorkPeriodMs = 2;
@@ skipping 246 matching lines @@
                                                  gfx::BufferFormat format,
                                                  uint32_t internal_format,
                                                  ui::NativePixmap* pixmap) {
 #if defined(USE_OZONE)
   gpu::gles2::ImageManager* image_manager = decoder_->GetImageManager();
   if (image_manager->LookupImage(id)) {
     LOG(ERROR) << "Image already exists with same ID.";
     return;
   }
 
-  scoped_refptr<gl::GLImageOzoneNativePixmap> image =
-      new gl::GLImageOzoneNativePixmap(size, internal_format);
+  scoped_refptr<ui::GLImageOzoneNativePixmap> image =
+      new ui::GLImageOzoneNativePixmap(size, internal_format);
   if (!image->Initialize(pixmap, format)) {
     NOTREACHED();
     return;
   }
 
   image_manager->AddImage(image.get(), id);
 #endif
 }
 
 void CommandBufferDriver::DestroyImage(int32_t id) {
@@ skipping 242 matching lines @@
 }
 
 void CommandBufferDriver::OnGpuCompletedSwapBuffers(gfx::SwapResult result) {
   DCHECK(CalledOnValidThread());
   if (client_) {
     client_->OnGpuCompletedSwapBuffers(result);
   }
 }
 
 }  // namespace ui