Rename traits and interface directories in /services/audio

This change renames public/interfaces to public/mojom and *_struct_traits_*
to *_mojom_traits_* in /services/audio.

Bug: 806965, 792441
Change-Id: I64ae6176bc9a8b88b0dc5fd1cc2c0746e13c3d23
Reviewed-on: https://chromium-review.googlesource.com/897665Reviewed-by: Max Morin <maxmorin@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Commit-Queue: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#533680}

services/audio/BUILD.gn

@@ -28,7 +28,7 @@ source_set("lib") {
   public_deps = [
     "//base",
     "//media",
-    "//services/audio/public/interfaces",
+    "//services/audio/public/mojom",
     "//services/service_manager/public/cpp",
   ]
 }
@@ -47,7 +47,7 @@ source_set("tests") {
     "//media:test_support",
     "//services/audio/public/cpp",
     "//services/audio/public/cpp:test_support",
-    "//services/audio/public/interfaces",
+    "//services/audio/public/mojom",
     "//services/service_manager/public/cpp",
     "//services/service_manager/public/cpp:service_test_support",
     "//testing/gmock",

services/audio/public/cpp/BUILD.gn

@@ -11,7 +11,7 @@ source_set("cpp") {
   public_deps = [
     "//base",
     "//media",
-    "//services/audio/public/interfaces",
+    "//services/audio/public/mojom",
     "//services/service_manager/public/cpp",
   ]
 }
@@ -27,7 +27,7 @@ source_set("test_support") {
   public_deps = [
     "//base",
     "//media",
-    "//services/audio/public/interfaces",
+    "//services/audio/public/mojom",
     "//services/service_manager/public/cpp",
   ]
 }

services/audio/public/cpp/OWNERS

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

services/audio/public/cpp/audio_device_description.typemap

@@ -2,12 +2,12 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-mojom = "//services/audio/public/interfaces/audio_device_description.mojom"
+mojom = "//services/audio/public/mojom/audio_device_description.mojom"
 public_headers = [ "//media/audio/audio_device_description.h" ]
 traits_headers =
-    [ "//services/audio/public/cpp/audio_device_description_struct_traits.h" ]
+    [ "//services/audio/public/cpp/audio_device_description_mojom_traits.h" ]
 sources = [
-  "//services/audio/public/cpp/audio_device_description_struct_traits.cc",
+  "//services/audio/public/cpp/audio_device_description_mojom_traits.cc",
 ]
 deps = [
   "//media",

services/audio/public/cpp/audio_device_description_struct_traits.cc → services/audio/public/cpp/audio_device_description_mojom_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/audio/public/cpp/audio_device_description_struct_traits.h"
+#include "services/audio/public/cpp/audio_device_description_mojom_traits.h"
 
 namespace mojo {
 // static

services/audio/public/cpp/audio_device_description_struct_traits.h → services/audio/public/cpp/audio_device_description_mojom_traits.h

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_AUDIO_PUBLIC_INTERFACES_AUDIO_DEVICE_DESCRIPTION_STRUCT_TRAITS_H_
-#define SERVICES_AUDIO_PUBLIC_INTERFACES_AUDIO_DEVICE_DESCRIPTION_STRUCT_TRAITS_H_
+#ifndef SERVICES_AUDIO_PUBLIC_INTERFACES_AUDIO_DEVICE_DESCRIPTION_MOJOM_TRAITS_H_
+#define SERVICES_AUDIO_PUBLIC_INTERFACES_AUDIO_DEVICE_DESCRIPTION_MOJOM_TRAITS_H_
 
 #include <string>
 
 #include "media/audio/audio_device_description.h"
-#include "services/audio/public/interfaces/system_info.mojom.h"
+#include "services/audio/public/mojom/system_info.mojom.h"
 
 namespace mojo {
 
@@ -31,4 +31,4 @@ struct StructTraits<audio::mojom::AudioDeviceDescriptionDataView,
 
 }  // namespace mojo
 
-#endif  // SERVICES_AUDIO_PUBLIC_INTERFACES_AUDIO_DEVICE_DESCRIPTION_STRUCT_TRAITS_H_
+#endif  // SERVICES_AUDIO_PUBLIC_INTERFACES_AUDIO_DEVICE_DESCRIPTION_MOJOM_TRAITS_H_

services/audio/public/cpp/audio_system_to_service_adapter.cc

@@ -7,7 +7,7 @@
 #include "base/bind.h"
 #include "base/logging.h"
 #include "mojo/public/cpp/bindings/callback_helpers.h"
-#include "services/audio/public/interfaces/constants.mojom.h"
+#include "services/audio/public/mojom/constants.mojom.h"
 #include "services/service_manager/public/cpp/connector.h"
 
 namespace audio {

services/audio/public/cpp/audio_system_to_service_adapter.h

@@ -9,7 +9,7 @@
 
 #include "base/threading/thread_checker.h"
 #include "media/audio/audio_system.h"
-#include "services/audio/public/interfaces/system_info.mojom.h"
+#include "services/audio/public/mojom/system_info.mojom.h"
 
 namespace service_manager {
 class Connector;

services/audio/public/cpp/fake_system_info.cc

@@ -4,7 +4,7 @@
 
 #include "services/audio/public/cpp/fake_system_info.h"
 
-#include "services/audio/public/interfaces/constants.mojom.h"
+#include "services/audio/public/mojom/constants.mojom.h"
 #include "services/service_manager/public/cpp/bind_source_info.h"
 #include "services/service_manager/public/cpp/service_context.h"
 

services/audio/public/cpp/fake_system_info.h

@@ -10,7 +10,7 @@
 #include "base/macros.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "mojo/public/cpp/system/message_pipe.h"
-#include "services/audio/public/interfaces/system_info.mojom.h"
+#include "services/audio/public/mojom/system_info.mojom.h"
 
 namespace service_manager {
 struct BindSourceInfo;

services/audio/public/interfaces/BUILD.gn → services/audio/public/mojom/BUILD.gn

@@ -4,7 +4,7 @@
 
 import("//mojo/public/tools/bindings/mojom.gni")
 
-mojom("interfaces") {
+mojom("mojom") {
   sources = [
     "audio_device_description.mojom",
     "system_info.mojom",

services/audio/public/interfaces/OWNERS → services/audio/public/mojom/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 *_mojom_traits*.*=set noparent
+per-file *_mojom_traits*.*=file://ipc/SECURITY_OWNERS
 per-file *.typemap=set noparent
 per-file *.typemap=file://ipc/SECURITY_OWNERS

services/audio/public/interfaces/system_info.mojom → services/audio/public/mojom/system_info.mojom

@@ -5,7 +5,7 @@
 module audio.mojom;
 
 import "media/mojo/interfaces/audio_parameters.mojom";
-import "services/audio/public/interfaces/audio_device_description.mojom";
+import "services/audio/public/mojom/audio_device_description.mojom";
 
 // Provides information about audio system.
 interface SystemInfo {

services/audio/service.h

@@ -10,7 +10,7 @@
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/threading/thread_checker.h"
-#include "services/audio/public/interfaces/system_info.mojom.h"
+#include "services/audio/public/mojom/system_info.mojom.h"
 #include "services/service_manager/public/cpp/binder_registry.h"
 #include "services/service_manager/public/cpp/service.h"
 

services/audio/system_info.h

@@ -12,7 +12,7 @@
 #include "base/sequence_checker.h"
 #include "media/audio/audio_system_helper.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/audio/public/interfaces/system_info.mojom.h"
+#include "services/audio/public/mojom/system_info.mojom.h"
 
 namespace media {
 class AudioManager;

services/audio/test/audio_system_to_service_adapter_test.cc

@@ -7,7 +7,7 @@
 #include "media/audio/test_audio_thread.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/audio/in_process_audio_manager_accessor.h"
-#include "services/audio/public/interfaces/constants.mojom.h"
+#include "services/audio/public/mojom/constants.mojom.h"
 #include "services/audio/system_info.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/interfaces/connector.mojom.h"

services/audio/test/in_process_service_test.cc

@@ -8,7 +8,7 @@
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/audio/public/cpp/audio_system_to_service_adapter.h"
 #include "services/audio/public/cpp/fake_system_info.h"
-#include "services/audio/public/interfaces/constants.mojom.h"
+#include "services/audio/public/mojom/constants.mojom.h"
 #include "services/audio/service_factory.h"
 #include "services/service_manager/public/cpp/service_context.h"
 #include "services/service_manager/public/cpp/service_test.h"