Convert Pass()→std::move() in //content/browser

content/browser/mojo/mojo_shell_context.cc

 // Copyright 2015 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 "content/browser/mojo/mojo_shell_context.h"
 
+#include <utility>
+
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/path_service.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/common/gpu/gpu_process_launch_causes.h"
 #include "content/common/process_control.mojom.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
@@ skipping 28 matching lines @@
     const base::string16& process_name,
     bool use_sandbox) {
   UtilityProcessHost* process_host =
       UtilityProcessHost::Create(nullptr, nullptr);
   process_host->SetName(process_name);
   if (!use_sandbox)
     process_host->DisableSandbox();
   process_host->StartMojoMode();
 
   ServiceRegistry* services = process_host->GetServiceRegistry();
-  services->ConnectToRemoteService(request.Pass());
+  services->ConnectToRemoteService(std::move(request));
 }
 
 void OnApplicationLoaded(const GURL& url, bool success) {
   if (!success)
     LOG(ERROR) << "Failed to launch Mojo application for " << url.spec();
 }
 
 // The default loader to use for all applications. This does nothing but drop
 // the Application request.
 class DefaultApplicationLoader : public mojo::shell::ApplicationLoader {
@@ skipping 23 matching lines @@
   // mojo::shell::ApplicationLoader:
   void Load(
       const GURL& url,
       mojo::InterfaceRequest<mojo::Application> application_request) override {
     ProcessControlPtr process_control;
     auto process_request = mojo::GetProxy(&process_control);
     BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                             base::Bind(&StartUtilityProcessOnIOThread,
                                        base::Passed(&process_request),
                                        process_name_, use_sandbox_));
-    process_control->LoadApplication(url.spec(), application_request.Pass(),
+    process_control->LoadApplication(url.spec(), std::move(application_request),
                                      base::Bind(&OnApplicationLoaded, url));
   }
 
   const base::string16 process_name_;
   const bool use_sandbox_;
 
   DISALLOW_COPY_AND_ASSIGN(UtilityProcessLoader);
 };
 
 // Request ProcessControl from GPU process host. Must be called on IO thread.
 void RequestGpuProcessControl(mojo::InterfaceRequest<ProcessControl> request) {
   BrowserChildProcessHostDelegate* process_host =
       GpuProcessHost::Get(GpuProcessHost::GPU_PROCESS_KIND_SANDBOXED,
                           CAUSE_FOR_GPU_LAUNCH_MOJO_SETUP);
   if (!process_host) {
     DLOG(ERROR) << "GPU process host not available.";
     return;
   }
 
   // TODO(xhwang): It's possible that |process_host| is non-null, but the actual
   // process is dead. In that case, |request| will be dropped and application
   // load requests through ProcessControl will also fail. Make sure we handle
   // these cases correctly.
-  process_host->GetServiceRegistry()->ConnectToRemoteService(request.Pass());
+  process_host->GetServiceRegistry()->ConnectToRemoteService(
+      std::move(request));
 }
 
 // Forwards the load request to the GPU process.
 class GpuProcessLoader : public mojo::shell::ApplicationLoader {
  public:
   GpuProcessLoader() {}
   ~GpuProcessLoader() override {}
 
  private:
   // mojo::shell::ApplicationLoader:
   void Load(
       const GURL& url,
       mojo::InterfaceRequest<mojo::Application> application_request) override {
     ProcessControlPtr process_control;
     auto process_request = mojo::GetProxy(&process_control);
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&RequestGpuProcessControl, base::Passed(&process_request)));
-    process_control->LoadApplication(url.spec(), application_request.Pass(),
+    process_control->LoadApplication(url.spec(), std::move(application_request),
                                      base::Bind(&OnApplicationLoaded, url));
   }
 
   DISALLOW_COPY_AND_ASSIGN(GpuProcessLoader);
 };
 
 }  // namespace
 
 // Thread-safe proxy providing access to the shell context from any thread.
 class MojoShellContext::Proxy {
  public:
   Proxy(MojoShellContext* shell_context)
       : shell_context_(shell_context),
         task_runner_(base::ThreadTaskRunnerHandle::Get()) {}
 
   ~Proxy() {}
 
   void ConnectToApplication(
       const GURL& url,
       const GURL& requestor_url,
       mojo::InterfaceRequest<mojo::ServiceProvider> request,
       mojo::ServiceProviderPtr exposed_services,
       const mojo::shell::CapabilityFilter& filter,
       const mojo::Shell::ConnectToApplicationCallback& callback) {
     if (task_runner_ == base::ThreadTaskRunnerHandle::Get()) {
       if (shell_context_) {
         shell_context_->ConnectToApplicationOnOwnThread(
-            url, requestor_url, request.Pass(), exposed_services.Pass(), filter,
-            callback);
+            url, requestor_url, std::move(request), std::move(exposed_services),
+            filter, callback);
       }
     } else {
       // |shell_context_| outlives the main MessageLoop, so it's safe for it to
       // be unretained here.
       task_runner_->PostTask(
           FROM_HERE,
           base::Bind(&MojoShellContext::ConnectToApplicationOnOwnThread,
                      base::Unretained(shell_context_), url, requestor_url,
                      base::Passed(&request), base::Passed(&exposed_services),
                      filter, callback));
@@ skipping 17 matching lines @@
 }
 
 MojoShellContext::MojoShellContext() {
   proxy_.Get().reset(new Proxy(this));
 
   // Construct with an empty filepath since mojo: urls can't be registered now
   // the url scheme registry is locked.
   scoped_ptr<mojo::package_manager::PackageManagerImpl> package_manager(
       new mojo::package_manager::PackageManagerImpl(base::FilePath(), nullptr));
   application_manager_.reset(
-      new mojo::shell::ApplicationManager(package_manager.Pass()));
+      new mojo::shell::ApplicationManager(std::move(package_manager)));
 
   application_manager_->set_default_loader(
       scoped_ptr<mojo::shell::ApplicationLoader>(new DefaultApplicationLoader));
 
   StaticApplicationMap apps;
   GetContentClient()->browser()->RegisterInProcessMojoApplications(&apps);
   if (g_applications_for_test) {
     // Add testing apps to the map, potentially overwriting whatever the
     // browser client registered.
     for (const auto& entry : *g_applications_for_test)
@@ skipping 45 matching lines @@
 }
 
 // static
 void MojoShellContext::ConnectToApplication(
     const GURL& url,
     const GURL& requestor_url,
     mojo::InterfaceRequest<mojo::ServiceProvider> request,
     mojo::ServiceProviderPtr exposed_services,
     const mojo::shell::CapabilityFilter& filter,
     const mojo::Shell::ConnectToApplicationCallback& callback) {
-  proxy_.Get()->ConnectToApplication(url, requestor_url,
-                                     request.Pass(), exposed_services.Pass(),
-                                     filter, callback);
+  proxy_.Get()->ConnectToApplication(url, requestor_url, std::move(request),
+                                     std::move(exposed_services), filter,
+                                     callback);
 }
 
 void MojoShellContext::ConnectToApplicationOnOwnThread(
     const GURL& url,
     const GURL& requestor_url,
     mojo::InterfaceRequest<mojo::ServiceProvider> request,
     mojo::ServiceProviderPtr exposed_services,
     const mojo::shell::CapabilityFilter& filter,
     const mojo::Shell::ConnectToApplicationCallback& callback) {
   scoped_ptr<mojo::shell::ConnectToApplicationParams> params(
       new mojo::shell::ConnectToApplicationParams);
   params->set_source(
       mojo::shell::Identity(requestor_url, std::string(),
                             mojo::shell::GetPermissiveCapabilityFilter()));
   params->SetTarget(mojo::shell::Identity(url, std::string(), filter));
-  params->set_services(request.Pass());
-  params->set_exposed_services(exposed_services.Pass());
+  params->set_services(std::move(request));
+  params->set_exposed_services(std::move(exposed_services));
   params->set_on_application_end(base::Bind(&base::DoNothing));
   params->set_connect_callback(callback);
-  application_manager_->ConnectToApplication(params.Pass());
+  application_manager_->ConnectToApplication(std::move(params));
 }
 
 }  // namespace content