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

ui/gl/gl_image_ozone_native_pixmap_unittest.cc

 // Copyright 2015 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 <stdint.h>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/buffer_types.h"
-#include "ui/gl/gl_image_ozone_native_pixmap.h"
 #include "ui/gl/test/gl_image_test_template.h"
+#include "ui/ozone/gl/gl_image_ozone_native_pixmap.h"
 #include "ui/ozone/public/client_native_pixmap.h"
 #include "ui/ozone/public/client_native_pixmap_factory.h"
 #include "ui/ozone/public/ozone_platform.h"
 #include "ui/ozone/public/surface_factory_ozone.h"
 
 namespace gl {
 namespace {
 
 const uint8_t kRed[] = {0xF0, 0x0, 0x0, 0xFF};
 const uint8_t kGreen[] = {0x0, 0xFF, 0x0, 0xFF};
@@ skipping 16 matching lines @@
       auto client_pixmap = client_pixmap_factory_->ImportFromHandle(
           pixmap->ExportHandle(), size, usage);
       void* data = client_pixmap->Map();
       EXPECT_TRUE(data);
       GLImageTestSupport::SetBufferDataToColor(
           size.width(), size.height(), pixmap->GetDmaBufPitch(0), 0,
           pixmap->GetBufferFormat(), color, static_cast<uint8_t*>(data));
       client_pixmap->Unmap();
     }
 
-    scoped_refptr<GLImageOzoneNativePixmap> image(new GLImageOzoneNativePixmap(
-        size, GLImageOzoneNativePixmap::GetInternalFormatForTesting(format)));
+    scoped_refptr<ui::GLImageOzoneNativePixmap> image(
+        new ui::GLImageOzoneNativePixmap(
+            size,
+            ui::GLImageOzoneNativePixmap::GetInternalFormatForTesting(format)));
     EXPECT_TRUE(image->Initialize(pixmap.get(), pixmap->GetBufferFormat()));
     return image;
   }
 
   unsigned GetTextureTarget() const { return GL_TEXTURE_EXTERNAL_OES; }
 
   const uint8_t* GetImageColor() {
     return format == gfx::BufferFormat::R_8 ? kRed : kGreen;
   }
 
@@ skipping 28 matching lines @@
 INSTANTIATE_TYPED_TEST_CASE_P(DISABLED_GLImageOzoneNativePixmapReadWrite,
                               GLImageTest,
                               GLImageReadWriteType);
 
 INSTANTIATE_TYPED_TEST_CASE_P(DISABLED_GLImageOzoneNativePixmap,
                               GLImageBindTest,
                               GLImageBindTestTypes);
 
 }  // namespace
 }  // namespace gl