Move native_pixmap.h from ui/ozone/public to ui/gfx

components/exo/display_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 "ash/public/cpp/shell_window_ids.h"
 #include "components/exo/buffer.h"
 #include "components/exo/display.h"
 #include "components/exo/shared_memory.h"
 #include "components/exo/shell_surface.h"
 #include "components/exo/sub_surface.h"
 #include "components/exo/surface.h"
 #include "components/exo/test/exo_test_base.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(USE_OZONE)
-#include "ui/ozone/public/native_pixmap.h"
+#include "ui/gfx/native_pixmap.h"
 #include "ui/ozone/public/ozone_platform.h"
 #include "ui/ozone/public/surface_factory_ozone.h"
 #endif
 
 namespace exo {
 namespace {
 
 using DisplayTest = test::ExoTestBase;
 
 TEST_F(DisplayTest, CreateSurface) {
@@ skipping 191 matching lines @@
   // Attempting to create a sub surface for parent with grandchild as its parent
   // should fail.
   EXPECT_FALSE(display->CreateSubSurface(parent.get(), grandchild.get()));
 
   // Create a sub surface for parent.
   EXPECT_TRUE(display->CreateSubSurface(parent.get(), toplevel.get()));
 }
 
 }  // namespace
 }  // namespace exo