[Chromecast] Move Mojo "interfaces" directories to "mojom"

This maintains consistency with other code.

Bug: 806965
Bug: internal b/79377657
Test: CQ
Change-Id: Iae3487bf573fcd704b0a9fda44ce1aaffe42d7a5
Reviewed-on: https://chromium-review.googlesource.com/1050694Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Stephen Lanham <slan@chromium.org>
Commit-Queue: Sean Topping <seantopping@chromium.org>
Cr-Commit-Position: refs/heads/master@{#557301}

chromecast/browser/BUILD.gn

@@ -104,11 +104,10 @@ cast_source_set("browser") {
     "//chromecast/base:cast_sys_info",
     "//chromecast/base:cast_version",
     "//chromecast/browser:resources",
-    "//chromecast/browser/bluetooth/public/interfaces",
+    "//chromecast/browser/bluetooth/public/mojom",
     "//chromecast/common",
-    "//chromecast/common:interfaces",
     "//chromecast/common/media",
-    "//chromecast/common/media:interfaces",
+    "//chromecast/common/mojom",
     "//chromecast/graphics",
     "//chromecast/media",
     "//chromecast/media:libcast_media",

chromecast/browser/application_media_capabilities.h

@@ -6,7 +6,7 @@
 #define CHROMECAST_BROWSER_APPLICATION_MEDIA_CAPABILITIES_H_
 
 #include "base/macros.h"
-#include "chromecast/common/application_media_capabilities.mojom.h"
+#include "chromecast/common/mojom/application_media_capabilities.mojom.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "mojo/public/cpp/bindings/interface_ptr_set.h"
 

chromecast/browser/bluetooth/cast_bluetooth_chooser.h

@@ -8,7 +8,7 @@
 #include <string>
 #include <unordered_set>
 
-#include "chromecast/browser/bluetooth/public/interfaces/web_bluetooth.mojom.h"
+#include "chromecast/browser/bluetooth/public/mojom/web_bluetooth.mojom.h"
 #include "content/public/browser/bluetooth_chooser.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
@@ -62,4 +62,4 @@ class CastBluetoothChooser : public content::BluetoothChooser,
 
 }  // namespace chromecast
 
-#endif  // CHROMECAST_BROWSER_BLUETOOTH_CAST_BLUETOOTH_CHOOSER_H_
\ No newline at end of file
+#endif  // CHROMECAST_BROWSER_BLUETOOTH_CAST_BLUETOOTH_CHOOSER_H_

chromecast/browser/bluetooth/public/interfaces/BUILD.gn → chromecast/browser/bluetooth/public/mojom/BUILD.gn

@@ -6,7 +6,7 @@ import("//mojo/public/tools/bindings/mojom.gni")
 
 # TODO(slan): This likely falls in the class of interfaces that are provided by
 # the browser. We should consider putting these in a common location.
-mojom("interfaces") {
+mojom("mojom") {
   sources = [
     "web_bluetooth.mojom",
   ]

chromecast/browser/media/media_caps_impl.h

@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "base/macros.h"
-#include "chromecast/common/media/media_caps.mojom.h"
+#include "chromecast/common/mojom/media_caps.mojom.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "mojo/public/cpp/bindings/interface_ptr_set.h"
 #include "ui/gfx/geometry/size.h"

chromecast/browser/memory_pressure_controller_impl.h

@@ -7,7 +7,7 @@
 
 #include "base/macros.h"
 #include "base/memory/memory_pressure_listener.h"
-#include "chromecast/common/memory_pressure.mojom.h"
+#include "chromecast/common/mojom/memory_pressure.mojom.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "mojo/public/cpp/bindings/interface_ptr_set.h"
 

chromecast/common/BUILD.gn

@@ -52,13 +52,3 @@ cast_source_set("common") {
     ]
   }
 }
-
-mojom("interfaces") {
-  sources = [
-    "application_media_capabilities.mojom",
-  ]
-
-  if (!is_android) {
-    sources += [ "memory_pressure.mojom" ]
-  }
-}

chromecast/common/media/BUILD.gn

@@ -24,9 +24,3 @@ cast_source_set("media") {
     public_configs = [ "//chromecast:playready_config" ]
   }
 }
-
-mojom("interfaces") {
-  sources = [
-    "media_caps.mojom",
-  ]
-}

chromecast/common/mojom/BUILD.gn

+# Copyright 2018 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("//mojo/public/tools/bindings/mojom.gni")
+
+mojom("mojom") {
+  sources = [
+    "application_media_capabilities.mojom",
+    "media_caps.mojom",
+    "memory_pressure.mojom",
+  ]
+}

chromecast/common/mojom/OWNERS

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

chromecast/renderer/BUILD.gn

@@ -48,8 +48,8 @@ cast_source_set("renderer") {
     "//base",
     "//chromecast:chromecast_buildflags",
     "//chromecast/base",
-    "//chromecast/common:interfaces",
     "//chromecast/common/media",
+    "//chromecast/common/mojom",
     "//chromecast/media",
     "//components/network_hints/renderer",
     "//content/public/common",
@@ -72,7 +72,7 @@ cast_source_set("renderer") {
     ]
 
     deps += [
-      "//chromecast/common:interfaces",
+      "//chromecast/common/mojom",
       "//mojo/public/cpp/bindings",
     ]
   }
@@ -88,8 +88,8 @@ cast_source_set("renderer") {
     ]
 
     deps += [
-      "//chromecast/common/extensions_api:api",
       "//chromecast/common",
+      "//chromecast/common/extensions_api:api",
       "//extensions/common",
       "//extensions/renderer",
       "//gin:gin",

chromecast/renderer/cast_content_renderer_client.h

@@ -11,7 +11,7 @@
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "chromecast/chromecast_buildflags.h"
-#include "chromecast/common/application_media_capabilities.mojom.h"
+#include "chromecast/common/mojom/application_media_capabilities.mojom.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "media/base/audio_codecs.h"
 #include "mojo/public/cpp/bindings/binding.h"

chromecast/renderer/media/BUILD.gn

@@ -15,7 +15,7 @@ cast_source_set("media") {
   deps = [
     "//base",
     "//chromecast:chromecast_buildflags",
-    "//chromecast/common/media:interfaces",
+    "//chromecast/common/mojom",
     "//chromecast/media",
     "//chromecast/media/cdm",
     "//chromecast/public:public",

chromecast/renderer/media/media_caps_observer_impl.h

@@ -8,7 +8,7 @@
 #include <memory>
 
 #include "base/macros.h"
-#include "chromecast/common/media/media_caps.mojom.h"
+#include "chromecast/common/mojom/media_caps.mojom.h"
 #include "chromecast/media/base/supported_codec_profile_levels_memo.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "ui/gfx/geometry/size.h"

chromecast/renderer/memory_pressure_observer_impl.h

@@ -6,7 +6,7 @@
 #define CHROMECAST_RENDERER_MEMORY_PRESSURE_OBSERVER_IMPL_H_
 
 #include "base/macros.h"
-#include "chromecast/common/memory_pressure.mojom.h"
+#include "chromecast/common/mojom/memory_pressure.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
 namespace chromecast {