Rename interfaces/ to mojom/ under //services/identity

Reasoning given in the umbrella bug (crbug.com/806965).

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: I7014b91a610c49e98fda3c78917637efb26f54f1
Reviewed-on: https://chromium-review.googlesource.com/901663
Commit-Queue: Colin Blundell <blundell@chromium.org>
Reviewed-by: Ken Rockot <rockot@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#534676}

chrome/browser/extensions/BUILD.gn

@@ -891,7 +891,7 @@ static_library("extensions") {
     "//rlz/features",
     "//services/data_decoder/public/cpp",
     "//services/device/public/interfaces",
-    "//services/identity/public/interfaces",
+    "//services/identity/public/mojom",
     "//services/network/public/interfaces",
     "//services/service_manager/public/cpp",
     "//services/service_manager/public/mojom",

chrome/browser/extensions/api/identity/identity_get_accounts_function.cc

@@ -10,8 +10,8 @@
 #include "components/signin/core/browser/profile_management_switches.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/common/service_manager_connection.h"
-#include "services/identity/public/interfaces/account.mojom.h"
-#include "services/identity/public/interfaces/constants.mojom.h"
+#include "services/identity/public/mojom/account.mojom.h"
+#include "services/identity/public/mojom/constants.mojom.h"
 #include "services/service_manager/public/cpp/connector.h"
 
 namespace extensions {

chrome/browser/extensions/api/identity/identity_get_accounts_function.h

@@ -7,7 +7,7 @@
 
 #include "extensions/browser/extension_function.h"
 #include "extensions/browser/extension_function_histogram_value.h"
-#include "services/identity/public/interfaces/identity_manager.mojom.h"
+#include "services/identity/public/mojom/identity_manager.mojom.h"
 
 namespace extensions {
 

chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc

@@ -28,7 +28,7 @@
 #include "extensions/common/extension_l10n_util.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "services/identity/public/cpp/scope_set.h"
-#include "services/identity/public/interfaces/constants.mojom.h"
+#include "services/identity/public/mojom/constants.mojom.h"
 #include "services/service_manager/public/cpp/connector.h"
 
 #if defined(OS_CHROMEOS)

chrome/browser/extensions/api/identity/identity_get_auth_token_function.h

@@ -13,7 +13,7 @@
 #include "google_apis/gaia/oauth2_mint_token_flow.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 #include "services/identity/public/cpp/account_state.h"
-#include "services/identity/public/interfaces/identity_manager.mojom.h"
+#include "services/identity/public/mojom/identity_manager.mojom.h"
 
 namespace extensions {
 

chrome/browser/extensions/api/identity/identity_get_profile_user_info_function.cc

@@ -10,7 +10,7 @@
 #include "content/public/common/service_manager_connection.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/permissions/permissions_data.h"
-#include "services/identity/public/interfaces/constants.mojom.h"
+#include "services/identity/public/mojom/constants.mojom.h"
 #include "services/service_manager/public/cpp/connector.h"
 
 namespace extensions {

chrome/browser/extensions/api/identity/identity_get_profile_user_info_function.h

@@ -9,7 +9,7 @@
 #include "extensions/browser/extension_function.h"
 #include "extensions/browser/extension_function_histogram_value.h"
 #include "services/identity/public/cpp/account_state.h"
-#include "services/identity/public/interfaces/identity_manager.mojom.h"
+#include "services/identity/public/mojom/identity_manager.mojom.h"
 
 namespace extensions {
 

chrome/browser/profiles/profile_impl.cc

@@ -126,7 +126,7 @@
 #include "ppapi/features/features.h"
 #include "printing/features/features.h"
 #include "services/identity/identity_service.h"
-#include "services/identity/public/interfaces/constants.mojom.h"
+#include "services/identity/public/mojom/constants.mojom.h"
 #include "services/preferences/public/cpp/in_process_service_factory.h"
 #include "services/preferences/public/interfaces/preferences.mojom.h"
 #include "services/preferences/public/interfaces/tracked_preference_validation_delegate.mojom.h"

components/multidevice/service/BUILD.gn

@@ -25,7 +25,7 @@ if (!is_ios && !is_android) {
     public_deps = [
       "//components/cryptauth",
       "//components/multidevice/service/public/interfaces",
-      "//services/identity/public/interfaces",
+      "//services/identity/public/mojom",
       "//services/service_manager/public/cpp",
     ]
   }

ios/chrome/browser/browser_state/BUILD.gn

@@ -204,7 +204,7 @@ source_set("eg_tests") {
     "//ios/third_party/earl_grey:earl_grey+link",
     "//ios/web:earl_grey_test_support",
     "//ios/web/public",
-    "//services/identity/public/interfaces",
+    "//services/identity/public/mojom",
     "//services/service_manager/public/cpp",
   ]
 }

ios/chrome/browser/browser_state/browser_state_services_egtest.mm

@@ -12,8 +12,8 @@
 #import "ios/testing/wait_util.h"
 #include "ios/web/public/browser_state.h"
 #include "ios/web/public/service_manager_connection.h"
-#include "services/identity/public/interfaces/constants.mojom.h"
-#include "services/identity/public/interfaces/identity_manager.mojom.h"
+#include "services/identity/public/mojom/constants.mojom.h"
+#include "services/identity/public/mojom/identity_manager.mojom.h"
 #include "services/service_manager/public/cpp/connector.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)

ios/chrome/browser/signin/BUILD.gn

@@ -82,7 +82,7 @@ source_set("signin") {
     "//net",
     "//services/identity:lib",
     "//services/identity/public/cpp",
-    "//services/identity/public/interfaces",
+    "//services/identity/public/mojom",
     "//url",
   ]
 }

ios/chrome/browser/signin/identity_service_creator.cc

@@ -11,7 +11,7 @@
 #include "ios/chrome/browser/signin/oauth2_token_service_factory.h"
 #include "ios/chrome/browser/signin/signin_manager_factory.h"
 #include "services/identity/identity_service.h"
-#include "services/identity/public/interfaces/constants.mojom.h"
+#include "services/identity/public/mojom/constants.mojom.h"
 
 namespace {
 

services/identity/BUILD.gn

@@ -19,7 +19,7 @@ source_set("lib") {
     "//components/signin/core/browser",
     "//components/signin/core/browser:account_info",
     "//services/identity/public/cpp:cpp_types",
-    "//services/identity/public/interfaces",
+    "//services/identity/public/mojom",
     "//services/service_manager/public/cpp",
     "//services/service_manager/public/mojom",
   ]
@@ -42,7 +42,7 @@ source_set("tests") {
     "//components/sync_preferences:test_support",
     "//mojo/public/cpp/bindings:bindings",
     "//services/identity/public/cpp",
-    "//services/identity/public/interfaces",
+    "//services/identity/public/mojom",
     "//services/service_manager/public/cpp",
     "//services/service_manager/public/cpp:service_test_support",
     "//testing/gmock",

services/identity/identity_manager_impl.cc

@@ -9,7 +9,7 @@
 #include "base/time/time.h"
 #include "components/signin/core/browser/account_tracker_service.h"
 #include "google_apis/gaia/google_service_auth_error.h"
-#include "services/identity/public/interfaces/account.mojom.h"
+#include "services/identity/public/mojom/account.mojom.h"
 
 namespace identity {
 

services/identity/identity_manager_impl.h

@@ -12,7 +12,7 @@
 #include "mojo/public/cpp/bindings/binding.h"
 #include "services/identity/public/cpp/account_state.h"
 #include "services/identity/public/cpp/scope_set.h"
-#include "services/identity/public/interfaces/identity_manager.mojom.h"
+#include "services/identity/public/mojom/identity_manager.mojom.h"
 
 class AccountTrackerService;
 

services/identity/identity_manager_impl_unittest.cc

@@ -15,8 +15,8 @@
 #include "services/identity/identity_service.h"
 #include "services/identity/public/cpp/account_state.h"
 #include "services/identity/public/cpp/scope_set.h"
-#include "services/identity/public/interfaces/constants.mojom.h"
-#include "services/identity/public/interfaces/identity_manager.mojom.h"
+#include "services/identity/public/mojom/constants.mojom.h"
+#include "services/identity/public/mojom/identity_manager.mojom.h"
 #include "services/service_manager/public/cpp/binder_registry.h"
 #include "services/service_manager/public/cpp/service_context.h"
 #include "services/service_manager/public/cpp/service_test.h"

services/identity/identity_service.h

@@ -6,7 +6,7 @@
 #define SERVICES_IDENTITY_IDENTITY_SERVICE_H_
 
 #include "components/signin/core/browser/signin_manager_base.h"
-#include "services/identity/public/interfaces/identity_manager.mojom.h"
+#include "services/identity/public/mojom/identity_manager.mojom.h"
 #include "services/service_manager/public/cpp/binder_registry.h"
 #include "services/service_manager/public/cpp/service.h"
 

services/identity/public/cpp/account_info.typemap

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-mojom = "//services/identity/public/interfaces/account_info.mojom"
+mojom = "//services/identity/public/mojom/account_info.mojom"
 public_headers = [ "//components/signin/core/browser/account_info.h" ]
 traits_headers =
     [ "//services/identity/public/cpp/account_info_struct_traits.h" ]

services/identity/public/cpp/account_info_struct_traits.h

@@ -8,7 +8,7 @@
 #include <string>
 
 #include "components/signin/core/browser/account_info.h"
-#include "services/identity/public/interfaces/account_info.mojom.h"
+#include "services/identity/public/mojom/account_info.mojom.h"
 
 namespace mojo {
 

services/identity/public/cpp/account_state.typemap

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-mojom = "//services/identity/public/interfaces/account_state.mojom"
+mojom = "//services/identity/public/mojom/account_state.mojom"
 public_headers = [ "//services/identity/public/cpp/account_state.h" ]
 traits_headers =
     [ "//services/identity/public/cpp/account_state_struct_traits.h" ]

services/identity/public/cpp/account_state_struct_traits.h

@@ -6,7 +6,7 @@
 #define SERVICES_IDENTITY_PUBLIC_CPP_ACCOUNT_STATE_STRUCT_TRAITS_H_
 
 #include "services/identity/public/cpp/account_state.h"
-#include "services/identity/public/interfaces/account_state.mojom.h"
+#include "services/identity/public/mojom/account_state.mojom.h"
 
 namespace mojo {
 

services/identity/public/cpp/google_service_auth_error.typemap

@@ -2,9 +2,11 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-mojom = "//services/identity/public/interfaces/google_service_auth_error.mojom"
+mojom = "//services/identity/public/mojom/google_service_auth_error.mojom"
 public_headers = [ "//google_apis/gaia/google_service_auth_error.h" ]
-traits_headers = [ "//services/identity/public/cpp/google_service_auth_error_struct_traits.h" ]
+traits_headers = [
+  "//services/identity/public/cpp/google_service_auth_error_struct_traits.h",
+]
 sources = [
   "//services/identity/public/cpp/google_service_auth_error_struct_traits.cc",
 ]

services/identity/public/cpp/google_service_auth_error_struct_traits.h

@@ -8,7 +8,7 @@
 #include <string>
 
 #include "google_apis/gaia/google_service_auth_error.h"
-#include "services/identity/public/interfaces/google_service_auth_error.mojom.h"
+#include "services/identity/public/mojom/google_service_auth_error.mojom.h"
 
 namespace mojo {
 

services/identity/public/cpp/scope_set.typemap

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-mojom = "//services/identity/public/interfaces/scope_set.mojom"
+mojom = "//services/identity/public/mojom/scope_set.mojom"
 public_headers = [ "//services/identity/public/cpp/scope_set.h" ]
 traits_headers = [ "//services/identity/public/cpp/scope_set_struct_traits.h" ]
 public_deps = [

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

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

services/identity/public/interfaces/account.mojom → services/identity/public/mojom/account.mojom

@@ -4,8 +4,8 @@
 
 module identity.mojom;
 
-import "services/identity/public/interfaces/account_info.mojom";
-import "services/identity/public/interfaces/account_state.mojom";
+import "services/identity/public/mojom/account_info.mojom";
+import "services/identity/public/mojom/account_state.mojom";
 
 // Represents a user's Google account on this device.
 struct Account {

services/identity/public/interfaces/identity_manager.mojom → services/identity/public/mojom/identity_manager.mojom

@@ -5,11 +5,11 @@
 module identity.mojom;
 
 import "mojo/common/time.mojom";
-import "services/identity/public/interfaces/account.mojom";
-import "services/identity/public/interfaces/account_info.mojom";
-import "services/identity/public/interfaces/account_state.mojom";
-import "services/identity/public/interfaces/google_service_auth_error.mojom";
-import "services/identity/public/interfaces/scope_set.mojom";
+import "services/identity/public/mojom/account.mojom";
+import "services/identity/public/mojom/account_info.mojom";
+import "services/identity/public/mojom/account_state.mojom";
+import "services/identity/public/mojom/google_service_auth_error.mojom";
+import "services/identity/public/mojom/scope_set.mojom";
 
 // Gives access to information about the user's Google accounts.
 interface IdentityManager {