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

ui/ozone/BUILD.gn

 # 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.
 
 import("//build/config/ui.gni")
 import("//ui/ozone/ozone.gni")
 import("//ui/ozone/ozone_extra.gni")
 import("//testing/test.gni")
 
 assert(use_ozone)
@@ skipping 104 matching lines @@
     "platform_selection.h",
     "public/client_native_pixmap_factory.cc",
     "public/ozone_gpu_test_helper.cc",
     "public/ozone_platform.cc",
     constructor_list_cc_file,
     platform_list_cc_file,
     platform_list_h_file,
   ]
 
   public = [
-    "public/client_native_pixmap_factory.h",
     "public/ozone_gpu_test_helper.h",
     "public/ozone_platform.h",
   ]
 
   defines = [ "OZONE_IMPLEMENTATION" ]
 
   public_deps = [
     ":ozone_base",
     "//base",
     "//ipc",
@@ skipping 11 matching lines @@
     ":generate_ozone_platform_list",
     "//ui/ozone/public/interfaces",
   ]
 
   deps += ozone_platform_deps
 
   # Platforms are always linked into //ui/ozone and can include our headers.
   allow_circular_includes_from = ozone_platform_deps
 
   # This is used for platform tests.
-  visibility += [ "//ui/ozone/platform/*" ]
+  visibility += [

[spang, 2017/02/27 18:49:05]

This is definitely not OK.

:platform is for platform tests only as it exposes a non-componentized version
of ozone. Depending on this directly from the listed components will cause ODR
violations.

[Julien Isorce, 2017/03/10 16:55:50]

Done.

+    "//content/renderer:renderer",
+    "//gpu/ipc/common:ipc_common_sources",
+    "//services/ui:lib",
+    "//ui/ozone/gl:ozone_gl_unittests",
+    "//ui/ozone/platform/*",
+  ]
 }
 
 component("ozone") {
   visibility = []
   visibility = [ "*" ]
   public_deps = [
     ":platform",
   ]
 }
 
@@ skipping 25 matching lines @@
   outputs = [
     constructor_list_cc_file,
   ]
 
   args = [
     "--platform_list=" + rebase_path(platform_list_txt_file, root_build_dir),
     "--output_cc=" + rebase_path(constructor_list_cc_file, root_build_dir),
     "--namespace=ui",
     "--typename=OzonePlatform",
     "--typename=ClientNativePixmapFactory",
+    "--include=\"ui/gfx/client_native_pixmap_factory.h\"",
     "--include=\"ui/ozone/public/ozone_platform.h\"",
-    "--include=\"ui/ozone/public/client_native_pixmap_factory.h\"",
   ]
 
   deps = [
     ":generate_ozone_platform_list",
   ]
 }
 
 test("ozone_unittests") {
   sources = [
     "run_all_unittests.cc",
   ]
 
   deps = [
     "//base/test:test_support",
     "//testing/gtest",
     "//ui/gfx/geometry",
   ]
 
   # Add tests of platform internals.
   deps += ozone_platform_test_deps
 
   # Platform tests link ozone statically. Make sure we're not getting a
   # 2nd copy of any code via the component.
   assert_no_deps = [ "//ui/ozone" ]
 }