Convert Pass()→std::move() in mojo/

mojo/runner/context.cc

 // Copyright 2013 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 "mojo/runner/context.h"
 
+#include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/i18n/icu_util.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
@@ skipping 117 matching lines @@
 
   ServiceProviderPtr devtools_service_provider;
   scoped_ptr<shell::ConnectToApplicationParams> params(
       new shell::ConnectToApplicationParams);
   params->set_source(shell::Identity(GURL("mojo:shell"), std::string(),
                                      shell::GetPermissiveCapabilityFilter()));
   params->SetTarget(shell::Identity(GURL("mojo:devtools_service"),
                                     std::string(),
                                     shell::GetPermissiveCapabilityFilter()));
   params->set_services(GetProxy(&devtools_service_provider));
-  manager->ConnectToApplication(params.Pass());
+  manager->ConnectToApplication(std::move(params));
 
   devtools_service::DevToolsCoordinatorPtr devtools_coordinator;
   devtools_service_provider->ConnectToService(
       devtools_service::DevToolsCoordinator::Name_,
       GetProxy(&devtools_coordinator).PassMessagePipe());
   devtools_coordinator->Initialize(static_cast<uint16_t>(port));
 }
 
 class TracingServiceProvider : public ServiceProvider {
  public:
   TracingServiceProvider(Tracer* tracer,
                          InterfaceRequest<ServiceProvider> request)
-      : tracer_(tracer), binding_(this, request.Pass()) {}
+      : tracer_(tracer), binding_(this, std::move(request)) {}
   ~TracingServiceProvider() override {}
 
   void ConnectToService(const mojo::String& service_name,
                         ScopedMessagePipeHandle client_handle) override {
     if (tracer_ && service_name == tracing::TraceProvider::Name_) {
       tracer_->ConnectToProvider(
-          MakeRequest<tracing::TraceProvider>(client_handle.Pass()));
+          MakeRequest<tracing::TraceProvider>(std::move(client_handle)));
     }
   }
 
  private:
   Tracer* tracer_;
   StrongBinding<ServiceProvider> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(TracingServiceProvider);
 };
 
@@ skipping 51 matching lines @@
   } else {
 #if defined(COMPONENT_BUILD)
     LOG(ERROR) << "Running Mojo in single process component build, which isn't "
                << "supported because statics in apps interact. Use static build"
                << " or don't pass --single-process.";
 #endif
     runner_factory.reset(
         new InProcessNativeRunnerFactory(task_runners_->blocking_pool()));
   }
   application_manager_.reset(new shell::ApplicationManager(
-      make_scoped_ptr(package_manager_), runner_factory.Pass(),
+      make_scoped_ptr(package_manager_), std::move(runner_factory),
       task_runners_->blocking_pool()));
 
   ServiceProviderPtr tracing_services;
   ServiceProviderPtr tracing_exposed_services;
   new TracingServiceProvider(&tracer_, GetProxy(&tracing_exposed_services));
 
   scoped_ptr<shell::ConnectToApplicationParams> params(
       new shell::ConnectToApplicationParams);
   params->set_source(shell::Identity(GURL("mojo:shell"), std::string(),
                                      shell::GetPermissiveCapabilityFilter()));
   params->SetTarget(shell::Identity(GURL("mojo:tracing"), std::string(),
                                     shell::GetPermissiveCapabilityFilter()));
   params->set_services(GetProxy(&tracing_services));
-  params->set_exposed_services(tracing_exposed_services.Pass());
-  application_manager_->ConnectToApplication(params.Pass());
+  params->set_exposed_services(std::move(tracing_exposed_services));
+  application_manager_->ConnectToApplication(std::move(params));
 
   if (command_line.HasSwitch(tracing::kTraceStartup)) {
     tracing::TraceCollectorPtr coordinator;
     auto coordinator_request = GetProxy(&coordinator);
     tracing_services->ConnectToService(tracing::TraceCollector::Name_,
                                        coordinator_request.PassMessagePipe());
-    tracer_.StartCollectingFromTracingService(coordinator.Pass());
+    tracer_.StartCollectingFromTracingService(std::move(coordinator));
   }
 
   // Record the shell startup metrics used for performance testing.
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           tracing::kEnableStatsCollectionBindings)) {
     tracing::StartupPerformanceDataCollectorPtr collector;
     tracing_services->ConnectToService(
         tracing::StartupPerformanceDataCollector::Name_,
         GetProxy(&collector).PassMessagePipe());
 #if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)
@@ skipping 36 matching lines @@
   ServiceProviderPtr services;
   ServiceProviderPtr exposed_services;
 
   app_urls_.insert(url);
 
   scoped_ptr<shell::ConnectToApplicationParams> params(
       new shell::ConnectToApplicationParams);
   params->SetTarget(shell::Identity(url, std::string(),
                                     shell::GetPermissiveCapabilityFilter()));
   params->set_services(GetProxy(&services));
-  params->set_exposed_services(exposed_services.Pass());
+  params->set_exposed_services(std::move(exposed_services));
   params->set_on_application_end(
       base::Bind(&Context::OnApplicationEnd, base::Unretained(this), url));
-  application_manager_->ConnectToApplication(params.Pass());
+  application_manager_->ConnectToApplication(std::move(params));
 }
 
 void Context::RunCommandLineApplication(const base::Closure& callback) {
   DCHECK(app_urls_.empty());
   DCHECK(app_complete_callback_.is_null());
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   base::CommandLine::StringVector args = command_line->GetArgs();
   for (size_t i = 0; i < args.size(); ++i) {
     GURL possible_app(args[i]);
     if (possible_app.SchemeIs("mojo")) {
@@ skipping 14 matching lines @@
         base::MessageLoop::current()->QuitWhenIdle();
       } else {
         app_complete_callback_.Run();
       }
     }
   }
 }
 
 }  // namespace runner
 }  // namespace mojo