[ios Mojo] Renamed service provider to service registry.

This name matches other platforms, which made the change here: https://codereview.chromium.org/1827473002 BUG=None Review-Url: https://codereview.chromium.org/2031893003 Cr-Commit-Position: refs/heads/master@{#397589}
qweri0p · Jun 3, 2016 · be477b9 · be477b9
1 parent 8e1b4e7
commit be477b9
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/ios/web/ios_web_resources.grd b/ios/web/ios_web_resources.grd
@@ -21,7 +21,7 @@
       <include name="IDR_IOS_MOJO_SYNC_MESSAGE_CHANNEL_JS" file="webui/resources/sync_message_channel.js" flattenhtml="true" type="BINDATA" />
       <include name="IDR_IOS_MOJO_HANDLE_UTIL_JS" file="webui/resources/handle_util.js" flattenhtml="true" type="BINDATA" />
       <include name="IDR_IOS_MOJO_CORE_JS" file="webui/resources/core.js" flattenhtml="true" type="BINDATA" />
-      <include name="IDR_IOS_MOJO_SERVICE_PROVIDER_JS" file="webui/resources/service_provider.js" flattenhtml="true" type="BINDATA" />
+      <include name="IDR_IOS_MOJO_SERVICE_REGISTRY_JS" file="webui/resources/service_registry.js" flattenhtml="true" type="BINDATA" />
     </includes>
   </release>
 </grit>
diff --git a/ios/web/test/data/mojo_test.js b/ios/web/test/data/mojo_test.js
@@ -13,8 +13,8 @@ define('main', [
   'mojo/public/js/core',
   'mojo/public/js/connection',
   'ios/web/test/mojo_test.mojom',
-  'content/public/renderer/service_provider',
-], function(bindings, core, connection, browser, serviceProvider) {
+  'content/public/renderer/frame_service_registry',
+], function(bindings, core, connection, browser, serviceRegistry) {
 
   var page;
 
@@ -52,7 +52,7 @@ define('main', [
 
   return function() {
     var browserProxy = connection.bindHandleToProxy(
-        serviceProvider.connectToService(browser.TestUIHandlerMojo.name),
+        serviceRegistry.connectToService(browser.TestUIHandlerMojo.name),
         browser.TestUIHandlerMojo);
 
     page = new TestPageImpl(browserProxy);

diff --git a/ios/web/webui/crw_web_ui_manager.mm b/ios/web/webui/crw_web_ui_manager.mm
@@ -257,7 +257,7 @@ - (BOOL)handleLoadMojo:(const base::ListValue*)arguments {
       {web::kHandleUtilModuleName, IDR_IOS_MOJO_HANDLE_UTIL_JS},
       {web::kSupportModuleName, IDR_IOS_MOJO_SUPPORT_JS},
       {web::kCoreModuleName, IDR_IOS_MOJO_CORE_JS},
-      {web::kServiceProviderModuleName, IDR_IOS_MOJO_SERVICE_PROVIDER_JS},
+      {web::kServiceRegistryModuleName, IDR_IOS_MOJO_SERVICE_REGISTRY_JS},
   };
   scoped_refptr<base::RefCountedMemory> scriptData(
       web::GetWebClient()->GetDataResourceBytes(resource_map[moduleName]));

diff --git a/ios/web/webui/mojo_js_constants.cc b/ios/web/webui/mojo_js_constants.cc
@@ -11,7 +11,7 @@ const char kSyncMessageChannelModuleName[] =
 const char kHandleUtilModuleName[] = "ios/mojo/public/js/handle_util";
 const char kSupportModuleName[] = "mojo/public/js/support";
 const char kCoreModuleName[] = "mojo/public/js/core";
-const char kServiceProviderModuleName[] =
-    "content/public/renderer/service_provider";
+const char kServiceRegistryModuleName[] =
+    "content/public/renderer/frame_service_registry";
 
 }  // namespace web
diff --git a/ios/web/webui/mojo_js_constants.h b/ios/web/webui/mojo_js_constants.h
@@ -11,7 +11,7 @@ extern const char kSyncMessageChannelModuleName[];
 extern const char kHandleUtilModuleName[];
 extern const char kSupportModuleName[];
 extern const char kCoreModuleName[];
-extern const char kServiceProviderModuleName[];
+extern const char kServiceRegistryModuleName[];
 
 }  // namespace web
 

diff --git a/ios/web/webui/resources/service_provider.js → ios/web/webui/resources/service_registry.js b/ios/web/webui/resources/service_provider.js → ios/web/webui/resources/service_registry.js
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Module "content/public/renderer/service_provider"
+// Module "content/public/renderer/frame_service_registry"
 //
 // This module provides the JavaScript bindings for
 // services/shell/public/cpp/connection.h.
 // Refer to that file for more detailed documentation for equivalent methods.
 
-define("content/public/renderer/service_provider", [
+define("content/public/renderer/frame_service_registry", [
   "ios/mojo/public/js/sync_message_channel",
   "ios/mojo/public/js/handle_util",
 ], function(syncMessageChannel, handleUtil) {