Change namespace from ui to gfx for NativePixmap related code

ui/ozone/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 <memory>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/buffer_types.h"
@@ skipping 18 matching lines @@
 template <gfx::BufferUsage usage, gfx::BufferFormat format>
 class GLImageNativePixmapTestDelegate {
  public:
   GLImageNativePixmapTestDelegate() {
     client_pixmap_factory_ = ui::CreateClientNativePixmapFactoryOzone();
   }
   scoped_refptr<GLImage> CreateSolidColorImage(const gfx::Size& size,
                                                const uint8_t color[4]) const {
     ui::SurfaceFactoryOzone* surface_factory =
         ui::OzonePlatform::GetInstance()->GetSurfaceFactoryOzone();
-    scoped_refptr<ui::NativePixmap> pixmap =
+    scoped_refptr<gfx::NativePixmap> pixmap =
         surface_factory->CreateNativePixmap(gfx::kNullAcceleratedWidget, size,
                                             format, usage);
     DCHECK(pixmap);
     if (usage == gfx::BufferUsage::GPU_READ_CPU_READ_WRITE) {
       auto client_pixmap = client_pixmap_factory_->ImportFromHandle(
           pixmap->ExportHandle(), size, usage);
       bool mapped = client_pixmap->Map();
       EXPECT_TRUE(mapped);
 
       for (size_t plane = 0; plane < NumberOfPlanesForBufferFormat(format);
            ++plane) {
         void* data = client_pixmap->GetMemoryAddress(plane);
         GLImageTestSupport::SetBufferDataToColor(
             size.width(), size.height(), pixmap->GetDmaBufPitch(plane), plane,
             pixmap->GetBufferFormat(), color, static_cast<uint8_t*>(data));
       }
       client_pixmap->Unmap();
     }
 
-    scoped_refptr<ui::GLImageNativePixmap> image(new ui::GLImageNativePixmap(
-        size, ui::GLImageNativePixmap::GetInternalFormatForTesting(format)));
+    scoped_refptr<gl::GLImageNativePixmap> image(new gl::GLImageNativePixmap(
+        size, gl::GLImageNativePixmap::GetInternalFormatForTesting(format)));
     EXPECT_TRUE(image->Initialize(pixmap.get(), pixmap->GetBufferFormat()));
     return image;
   }
 
   unsigned GetTextureTarget() const { return GL_TEXTURE_EXTERNAL_OES; }
 
   const uint8_t* GetImageColor() {
     if (format == gfx::BufferFormat::R_8) {
       return kRed;
     } else if (format == gfx::BufferFormat::YVU_420) {
       return kYvuColor;
     }
     return kGreen;
   }
 
  private:
-  std::unique_ptr<ui::ClientNativePixmapFactory> client_pixmap_factory_;
+  std::unique_ptr<gfx::ClientNativePixmapFactory> client_pixmap_factory_;
 };
 
 using GLImageScanoutType = testing::Types<
     GLImageNativePixmapTestDelegate<gfx::BufferUsage::SCANOUT,
                                     gfx::BufferFormat::BGRA_8888>>;
 
 INSTANTIATE_TYPED_TEST_CASE_P(GLImageNativePixmapScanout,
                               GLImageTest,
                               GLImageScanoutType);
 
@@ skipping 17 matching lines @@
 INSTANTIATE_TYPED_TEST_CASE_P(DISABLED_GLImageNativePixmapReadWrite,
                               GLImageTest,
                               GLImageReadWriteType);
 
 INSTANTIATE_TYPED_TEST_CASE_P(DISABLED_GLImageNativePixmap,
                               GLImageBindTest,
                               GLImageBindTestTypes);
 
 }  // namespace
 }  // namespace gl