services/test/*/public/{interfaces => mojom}

TBR=dcheng@chromium.org
TBR=jam@chromium.org

Bug: 806965
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: Ifdb2041f20f777b06180bc981786d1c6777eb778
Reviewed-on: https://chromium-review.googlesource.com/911999
Commit-Queue: Ken Rockot <rockot@chromium.org>
Reviewed-by: Ken Rockot <rockot@chromium.org>
Cr-Commit-Position: refs/heads/master@{#536003}

content/browser/service_manager/service_manager_context_browsertest.cc

@@ -19,7 +19,7 @@
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/mojom/constants.mojom.h"
 #include "services/service_manager/public/mojom/service_manager.mojom.h"
-#include "services/test/echo/public/interfaces/echo.mojom.h"
+#include "services/test/echo/public/mojom/echo.mojom.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

content/shell/BUILD.gn

@@ -271,7 +271,7 @@ static_library("content_shell_lib") {
     "//services/network/public/cpp",
     "//services/service_manager/public/cpp",
     "//services/test/echo:lib",
-    "//services/test/echo/public/interfaces",
+    "//services/test/echo/public/mojom",
     "//skia",
     "//storage/browser",
     "//testing/gmock",

content/shell/browser/shell_content_browser_client.cc

@@ -43,7 +43,7 @@
 #include "net/ssl/client_cert_identity.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context_getter.h"
-#include "services/test/echo/public/interfaces/echo.mojom.h"
+#include "services/test/echo/public/mojom/echo.mojom.h"
 #include "storage/browser/quota/quota_settings.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "url/gurl.h"

content/test/BUILD.gn

@@ -897,7 +897,7 @@ test("content_browsertests") {
     "//services/device/public/interfaces:generic_sensor",
     "//services/network:test_support",
     "//services/service_manager/public/cpp",
-    "//services/test/echo/public/interfaces",
+    "//services/test/echo/public/mojom",
     "//services/ui/public/cpp/gpu",
     "//services/video_capture/public/cpp",
     "//services/video_capture/public/interfaces:constants",

ios/web/shell/BUILD.gn

@@ -125,9 +125,9 @@ source_set("shell") {
     "//net:extras",
     "//services/service_manager/public/cpp",
     "//services/test/echo:lib",
-    "//services/test/echo/public/interfaces",
+    "//services/test/echo/public/mojom",
     "//services/test/user_id:lib",
-    "//services/test/user_id/public/interfaces",
+    "//services/test/user_id/public/mojom",
     "//ui/base",
   ]
 

ios/web/shell/test/BUILD.gn

@@ -40,8 +40,8 @@ ios_eg_test("ios_web_shell_egtests") {
     "//ios/web/shell:shell_interfaces",
     "//net",
     "//services/service_manager/public/cpp",
-    "//services/test/echo/public/interfaces",
-    "//services/test/user_id/public/interfaces",
+    "//services/test/echo/public/mojom",
+    "//services/test/user_id/public/mojom",
     "//url",
 
     # All shared libraries must have the sanitizer deps to properly link in

ios/web/shell/test/service_manager_egtest.mm

@@ -14,8 +14,8 @@
 #import "ios/web/shell/test/earl_grey/web_shell_test_case.h"
 #import "ios/web/shell/web_usage_controller.mojom.h"
 #include "services/service_manager/public/cpp/connector.h"
-#include "services/test/echo/public/interfaces/echo.mojom.h"
-#include "services/test/user_id/public/interfaces/user_id.mojom.h"
+#include "services/test/echo/public/mojom/echo.mojom.h"
+#include "services/test/user_id/public/mojom/user_id.mojom.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."

services/test/echo/BUILD.gn

@@ -16,7 +16,7 @@ source_set("lib") {
     "//base",
     "//services/service_manager/public/cpp",
     "//services/service_manager/public/mojom",
-    "//services/test/echo/public/interfaces",
+    "//services/test/echo/public/mojom",
   ]
 }
 

services/test/echo/echo_service.h

@@ -8,7 +8,7 @@
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/service_manager/public/cpp/binder_registry.h"
 #include "services/service_manager/public/cpp/service.h"
-#include "services/test/echo/public/interfaces/echo.mojom.h"
+#include "services/test/echo/public/mojom/echo.mojom.h"
 
 namespace echo {
 

services/test/echo/public/interfaces/BUILD.gn → services/test/echo/public/mojom/BUILD.gn

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

services/test/user_id/BUILD.gn

@@ -16,7 +16,7 @@ source_set("lib") {
     "//base",
     "//services/service_manager/public/cpp",
     "//services/service_manager/public/mojom",
-    "//services/test/user_id/public/interfaces",
+    "//services/test/user_id/public/mojom",
   ]
 }
 

services/test/user_id/public/interfaces/BUILD.gn → services/test/user_id/public/mojom/BUILD.gn

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

services/test/user_id/user_id_service.h

@@ -8,7 +8,7 @@
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/service_manager/public/cpp/binder_registry.h"
 #include "services/service_manager/public/cpp/service.h"
-#include "services/test/user_id/public/interfaces/user_id.mojom.h"
+#include "services/test/user_id/public/mojom/user_id.mojom.h"
 
 namespace user_id {