Commit 0f006a4f authored by Ken Rockot's avatar Ken Rockot Committed by Commit Bot

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: default avatarKen Rockot <rockot@chromium.org>
Cr-Commit-Position: refs/heads/master@{#536003}
parent d7e999b6
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "services/service_manager/public/cpp/connector.h" #include "services/service_manager/public/cpp/connector.h"
#include "services/service_manager/public/mojom/constants.mojom.h" #include "services/service_manager/public/mojom/constants.mojom.h"
#include "services/service_manager/public/mojom/service_manager.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/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
......
...@@ -271,7 +271,7 @@ static_library("content_shell_lib") { ...@@ -271,7 +271,7 @@ static_library("content_shell_lib") {
"//services/network/public/cpp", "//services/network/public/cpp",
"//services/service_manager/public/cpp", "//services/service_manager/public/cpp",
"//services/test/echo:lib", "//services/test/echo:lib",
"//services/test/echo/public/interfaces", "//services/test/echo/public/mojom",
"//skia", "//skia",
"//storage/browser", "//storage/browser",
"//testing/gmock", "//testing/gmock",
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
#include "net/ssl/client_cert_identity.h" #include "net/ssl/client_cert_identity.h"
#include "net/url_request/url_request.h" #include "net/url_request/url_request.h"
#include "net/url_request/url_request_context_getter.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 "storage/browser/quota/quota_settings.h"
#include "ui/base/resource/resource_bundle.h" #include "ui/base/resource/resource_bundle.h"
#include "url/gurl.h" #include "url/gurl.h"
......
...@@ -897,7 +897,7 @@ test("content_browsertests") { ...@@ -897,7 +897,7 @@ test("content_browsertests") {
"//services/device/public/interfaces:generic_sensor", "//services/device/public/interfaces:generic_sensor",
"//services/network:test_support", "//services/network:test_support",
"//services/service_manager/public/cpp", "//services/service_manager/public/cpp",
"//services/test/echo/public/interfaces", "//services/test/echo/public/mojom",
"//services/ui/public/cpp/gpu", "//services/ui/public/cpp/gpu",
"//services/video_capture/public/cpp", "//services/video_capture/public/cpp",
"//services/video_capture/public/interfaces:constants", "//services/video_capture/public/interfaces:constants",
......
...@@ -125,9 +125,9 @@ source_set("shell") { ...@@ -125,9 +125,9 @@ source_set("shell") {
"//net:extras", "//net:extras",
"//services/service_manager/public/cpp", "//services/service_manager/public/cpp",
"//services/test/echo:lib", "//services/test/echo:lib",
"//services/test/echo/public/interfaces", "//services/test/echo/public/mojom",
"//services/test/user_id:lib", "//services/test/user_id:lib",
"//services/test/user_id/public/interfaces", "//services/test/user_id/public/mojom",
"//ui/base", "//ui/base",
] ]
......
...@@ -40,8 +40,8 @@ ios_eg_test("ios_web_shell_egtests") { ...@@ -40,8 +40,8 @@ ios_eg_test("ios_web_shell_egtests") {
"//ios/web/shell:shell_interfaces", "//ios/web/shell:shell_interfaces",
"//net", "//net",
"//services/service_manager/public/cpp", "//services/service_manager/public/cpp",
"//services/test/echo/public/interfaces", "//services/test/echo/public/mojom",
"//services/test/user_id/public/interfaces", "//services/test/user_id/public/mojom",
"//url", "//url",
# All shared libraries must have the sanitizer deps to properly link in # All shared libraries must have the sanitizer deps to properly link in
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
#import "ios/web/shell/test/earl_grey/web_shell_test_case.h" #import "ios/web/shell/test/earl_grey/web_shell_test_case.h"
#import "ios/web/shell/web_usage_controller.mojom.h" #import "ios/web/shell/web_usage_controller.mojom.h"
#include "services/service_manager/public/cpp/connector.h" #include "services/service_manager/public/cpp/connector.h"
#include "services/test/echo/public/interfaces/echo.mojom.h" #include "services/test/echo/public/mojom/echo.mojom.h"
#include "services/test/user_id/public/interfaces/user_id.mojom.h" #include "services/test/user_id/public/mojom/user_id.mojom.h"
#if !defined(__has_feature) || !__has_feature(objc_arc) #if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support." #error "This file requires ARC support."
......
...@@ -16,7 +16,7 @@ source_set("lib") { ...@@ -16,7 +16,7 @@ source_set("lib") {
"//base", "//base",
"//services/service_manager/public/cpp", "//services/service_manager/public/cpp",
"//services/service_manager/public/mojom", "//services/service_manager/public/mojom",
"//services/test/echo/public/interfaces", "//services/test/echo/public/mojom",
] ]
} }
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include "mojo/public/cpp/bindings/binding_set.h" #include "mojo/public/cpp/bindings/binding_set.h"
#include "services/service_manager/public/cpp/binder_registry.h" #include "services/service_manager/public/cpp/binder_registry.h"
#include "services/service_manager/public/cpp/service.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 { namespace echo {
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
import("//mojo/public/tools/bindings/mojom.gni") import("//mojo/public/tools/bindings/mojom.gni")
mojom("interfaces") { mojom("mojom") {
sources = [ sources = [
"echo.mojom", "echo.mojom",
] ]
......
...@@ -16,7 +16,7 @@ source_set("lib") { ...@@ -16,7 +16,7 @@ source_set("lib") {
"//base", "//base",
"//services/service_manager/public/cpp", "//services/service_manager/public/cpp",
"//services/service_manager/public/mojom", "//services/service_manager/public/mojom",
"//services/test/user_id/public/interfaces", "//services/test/user_id/public/mojom",
] ]
} }
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
import("//mojo/public/tools/bindings/mojom.gni") import("//mojo/public/tools/bindings/mojom.gni")
mojom("interfaces") { mojom("mojom") {
sources = [ sources = [
"user_id.mojom", "user_id.mojom",
] ]
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include "mojo/public/cpp/bindings/binding_set.h" #include "mojo/public/cpp/bindings/binding_set.h"
#include "services/service_manager/public/cpp/binder_registry.h" #include "services/service_manager/public/cpp/binder_registry.h"
#include "services/service_manager/public/cpp/service.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 { namespace user_id {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment