viz: Move StructTraits and typemap files from public/interfaces to public/cpp

Per discussion with rockot and others, StructTraits and typemap files are
language specific and should live in public/cpp instead of public/interfaces.

Change-Id: Id7fb1f5e733f6b2913f0da2332062c72f386ebab
Reviewed-on: https://chromium-review.googlesource.com/596751
Commit-Queue: Saman Sami <samans@chromium.org>
Reviewed-by: Ken Rockot <rockot@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Fady Samuel <fsamuel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#491770}

mojo/public/tools/bindings/chromium_bindings_configuration.gni

@@ -36,7 +36,7 @@ _typemap_imports = [
   "//services/ui/public/interfaces/cursor/typemaps.gni",
   "//services/ui/public/interfaces/ime/typemaps.gni",
   "//services/viz/compositing/privileged/interfaces/typemaps.gni",
-  "//services/viz/public/interfaces/compositing/typemaps.gni",
+  "//services/viz/public/cpp/compositing/typemaps.gni",
   "//skia/public/interfaces/typemaps.gni",
   "//third_party/WebKit/public/public_typemaps.gni",
   "//ui/base/mojo/typemaps.gni",

services/BUILD.gn

@@ -29,7 +29,7 @@ service_test("services_unittests") {
       "//services/resource_coordinator:tests",
       "//services/shape_detection:tests",
       "//services/viz/compositing/privileged/interfaces:tests",
-      "//services/viz/public/interfaces/compositing:tests",
+      "//services/viz/public/cpp/compositing:tests",
     ]
   }
 

services/viz/public/interfaces/compositing/DEPS → services/viz/DEPS

 include_rules = [
   "+components/viz",
-  "+ui/gfx/mojo",
 ]

services/viz/compositing/privileged/interfaces/renderer_settings_struct_traits.cc

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "services/viz/compositing/privileged/interfaces/renderer_settings_struct_traits.h"
-#include "services/viz/public/interfaces/compositing/resource_settings_struct_traits.h"
+#include "services/viz/public/cpp/compositing/resource_settings_struct_traits.h"
 
 namespace mojo {
 

services/viz/compositing/privileged/interfaces/struct_traits_unittest.cc

@@ -9,7 +9,7 @@
 #include "components/viz/common/resources/resource_settings.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/viz/compositing/privileged/interfaces/renderer_settings_struct_traits.h"
-#include "services/viz/public/interfaces/compositing/resource_settings_struct_traits.h"
+#include "services/viz/public/cpp/compositing/resource_settings_struct_traits.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace viz {

services/viz/public/cpp/compositing/BUILD.gn

+# Copyright 2017 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.
+
+source_set("tests") {
+  testonly = true
+
+  sources = [
+    "struct_traits_unittest.cc",
+  ]
+
+  deps = [
+    "//base/test:test_support",
+    "//components/viz/common:common",
+    "//media/capture/mojo:capture_types",
+    "//services/service_manager/public/cpp",
+    "//services/service_manager/public/cpp:service_test_support",
+    "//services/viz/public/interfaces/compositing",
+    "//testing/gtest",
+    "//ui/gfx:test_support",
+  ]
+}

services/viz/public/cpp/compositing/DEPS

+include_rules = [
+  "+ui/gfx/mojo",
+]

services/viz/public/cpp/compositing/OWNERS

+per-file *_struct_traits*.*=set noparent
+per-file *_struct_traits*.*=file://ipc/SECURITY_OWNERS
+per-file *.typemap=set noparent
+per-file *.typemap=file://ipc/SECURITY_OWNERS

services/viz/public/interfaces/compositing/resource_settings.typemap → services/viz/public/cpp/compositing/resource_settings.typemap

@@ -4,14 +4,14 @@
 
 mojom = "//services/viz/public/interfaces/compositing/resource_settings.mojom"
 public_headers = [ "//components/viz/common/resources/resource_settings.h" ]
-traits_headers = [ "//services/viz/public/interfaces/compositing/resource_settings_struct_traits.h" ]
+traits_headers = [ "//services/viz/public/cpp/compositing/resource_settings_struct_traits.h" ]
 deps = [
   "//cc",
   "//mojo/common:struct_traits",
   "//ui/gfx/mojo",
 ]
 sources = [
-  "resource_settings_struct_traits.cc",
+  "//services/viz/public/cpp/compositing/resource_settings_struct_traits.cc",
 ]
 type_mappings = [
   "viz.mojom.BufferToTextureTargetKey=std::pair<gfx::BufferUsage, gfx::BufferFormat>",

services/viz/public/interfaces/compositing/resource_settings_struct_traits.cc → services/viz/public/cpp/compositing/resource_settings_struct_traits.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "services/viz/public/interfaces/compositing/resource_settings_struct_traits.h"
+#include "services/viz/public/cpp/compositing/resource_settings_struct_traits.h"
 
 namespace mojo {
 

services/viz/public/interfaces/compositing/struct_traits_unittest.cc → services/viz/public/cpp/compositing/struct_traits_unittest.cc

@@ -7,7 +7,7 @@
 #include "base/message_loop/message_loop.h"
 #include "components/viz/common/resources/resource_settings.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/viz/public/interfaces/compositing/resource_settings_struct_traits.h"
+#include "services/viz/public/cpp/compositing/resource_settings_struct_traits.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace viz {

services/viz/public/interfaces/compositing/typemaps.gni → services/viz/public/cpp/compositing/typemaps.gni

@@ -2,5 +2,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-typemaps =
-    [ "//services/viz/public/interfaces/compositing/resource_settings.typemap" ]
+typemaps = [ "//services/viz/public/cpp/compositing/resource_settings.typemap" ]

services/viz/public/interfaces/compositing/BUILD.gn

@@ -16,22 +16,3 @@ mojom("compositing") {
     "//ui/gfx/mojo",
   ]
 }
-
-source_set("tests") {
-  testonly = true
-
-  sources = [
-    "struct_traits_unittest.cc",
-  ]
-
-  deps = [
-    ":compositing",
-    "//base/test:test_support",
-    "//components/viz/common:common",
-    "//media/capture/mojo:capture_types",
-    "//services/service_manager/public/cpp",
-    "//services/service_manager/public/cpp:service_test_support",
-    "//testing/gtest",
-    "//ui/gfx:test_support",
-  ]
-}

services/viz/public/interfaces/compositing/OWNERS

 per-file *.mojom=set noparent
 per-file *.mojom=file://ipc/SECURITY_OWNERS
-per-file *_struct_traits*.*=set noparent
-per-file *_struct_traits*.*=file://ipc/SECURITY_OWNERS
-per-file *.typemap=set noparent
-per-file *.typemap=file://ipc/SECURITY_OWNERS