mojo:: Rename mojo::GetProxy() to mojo::MakeRequest()

services/service_manager/service_manager.cc

 // Copyright 2014 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.
 
 #include "services/service_manager/service_manager.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 496 matching lines @@
 // ServiceManager, public:
 
 ServiceManager::ServiceManager(
     std::unique_ptr<ServiceProcessLauncherFactory>
         service_process_launcher_factory,
     mojom::ServicePtr catalog)
     : service_process_launcher_factory_(
           std::move(service_process_launcher_factory)),
       weak_ptr_factory_(this) {
   mojom::ServicePtr service;
-  mojom::ServiceRequest request = mojo::GetProxy(&service);
+  mojom::ServiceRequest request = mojo::MakeRequest(&service);
 
   InterfaceProviderSpec spec;
   spec.provides[kCapability_ServiceManager].insert(
       "service_manager::mojom::ServiceManager");
   spec.requires["*"].insert("service_manager:service_factory");
   spec.requires[catalog::mojom::kServiceName].insert(
       "service_manager:resolver");
   spec.requires[tracing::mojom::kServiceName].insert("app");
   InterfaceProviderSpecMap specs;
   specs[mojom::kServiceManager_ConnectorSpec] = spec;
@@ skipping 46 matching lines @@
 
 mojom::ServiceRequest ServiceManager::StartEmbedderService(
     const std::string& name) {
   std::unique_ptr<ConnectParams> params(new ConnectParams);
 
   Identity embedder_identity(name, mojom::kRootUserID);
   params->set_source(embedder_identity);
   params->set_target(embedder_identity);
 
   mojom::ServicePtr service;
-  mojom::ServiceRequest request = mojo::GetProxy(&service);
+  mojom::ServiceRequest request = mojo::MakeRequest(&service);
   Connect(std::move(params), std::move(service), nullptr);
 
   return request;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ServiceManager, private:
 
 void ServiceManager::InitCatalog(mojom::ServicePtr catalog) {
   // TODO(beng): It'd be great to build this from the manifest, however there's
@@ skipping 277 matching lines @@
     // If a ServicePtr was provided, there's no more work to do: someone
     // is already holding a corresponding ServiceRequest.
     instance->StartWithService(std::move(service));
   } else if (!client_process_connection.is_null()) {
     // Likewise if a ClientProcessConnection was given via Connect(), it
     // provides the Service proxy to use.
     instance->StartWithClientProcessConnection(
         std::move(client_process_connection));
   } else {
     // Otherwise we create a new Service pipe.
-    mojom::ServiceRequest request = GetProxy(&service);
+    mojom::ServiceRequest request = MakeRequest(&service);
     CHECK(!result->package_path.empty());
 
     // The catalog was unable to read a manifest for this service. We can't do
     // anything more.
     // TODO(beng): There may be some cases where it's valid to have an empty
     // spec, so we should probably include a return value in |result|.
     if (result->interface_provider_specs.empty()) {
       LOG(ERROR)
           << "Error: The catalog was unable to read a manifest for service \""
           << result->name << "\".";
@@ skipping 47 matching lines @@
   // Now that the instance has a Service, we can connect to it.
   bool connected = instance->ConnectToService(&params);
   DCHECK(connected);
 }
 
 base::WeakPtr<ServiceManager> ServiceManager::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
 }  // namespace service_manager