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

mojo/shell/application_instance.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 "mojo/shell/application_instance.h"
 
+#include <utility>
+
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "mojo/application/public/interfaces/content_handler.mojom.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/common/url_type_converters.h"
 #include "mojo/shell/application_manager.h"
 
 namespace mojo {
 namespace shell {
 
 ApplicationInstance::ApplicationInstance(
     ApplicationPtr application,
     ApplicationManager* manager,
     const Identity& identity,
     uint32_t requesting_content_handler_id,
     const base::Closure& on_application_end)
     : manager_(manager),
       identity_(identity),
       allow_any_application_(identity.filter().size() == 1 &&
                              identity.filter().count("*") == 1),
       requesting_content_handler_id_(requesting_content_handler_id),
       on_application_end_(on_application_end),
-      application_(application.Pass()),
+      application_(std::move(application)),
       binding_(this),
       queue_requests_(false),
       native_runner_(nullptr),
-      pid_(base::kNullProcessId) {
-}
+      pid_(base::kNullProcessId) {}
 
 ApplicationInstance::~ApplicationInstance() {
   for (auto request : queued_client_requests_)
     request->connect_callback().Run(kInvalidContentHandlerID);
   STLDeleteElements(&queued_client_requests_);
 }
 
 void ApplicationInstance::InitializeApplication() {
   ShellPtr shell;
   binding_.Bind(GetProxy(&shell));
   binding_.set_connection_error_handler([this]() { OnConnectionError(); });
-  application_->Initialize(shell.Pass(), identity_.url().spec());
+  application_->Initialize(std::move(shell), identity_.url().spec());
 }
 
 void ApplicationInstance::ConnectToClient(
     scoped_ptr<ConnectToApplicationParams> params) {
   if (queue_requests_) {
     queued_client_requests_.push_back(params.release());
     return;
   }
 
-  CallAcceptConnection(params.Pass());
+  CallAcceptConnection(std::move(params));
 }
 
 void ApplicationInstance::SetNativeRunner(NativeRunner* native_runner) {
   native_runner_ = native_runner;
   pid_ = native_runner_->GetApplicationPID();
 }
 
 base::ProcessId ApplicationInstance::GetProcessId() const {
   return pid_;
 }
@@ skipping 16 matching lines @@
       identity_.filter().find(url.spec()) != identity_.filter().end()) {
     CapabilityFilter capability_filter = GetPermissiveCapabilityFilter();
     if (!filter.is_null())
       capability_filter = filter->filter.To<CapabilityFilter>();
 
     scoped_ptr<ConnectToApplicationParams> params(
         new ConnectToApplicationParams);
     params->SetSource(this);
     GURL app_url(app_request->url);
     params->SetTargetURLRequest(
-        app_request.Pass(),
+        std::move(app_request),
         Identity(app_url, std::string(), capability_filter));
-    params->set_services(services.Pass());
-    params->set_exposed_services(exposed_services.Pass());
+    params->set_services(std::move(services));
+    params->set_exposed_services(std::move(exposed_services));
     params->set_connect_callback(callback);
-    manager_->ConnectToApplication(params.Pass());
+    manager_->ConnectToApplication(std::move(params));
   } else {
     LOG(WARNING) << "CapabilityFilter prevented connection from: " <<
         identity_.url() << " to: " << url.spec();
     callback.Run(kInvalidContentHandlerID);
   }
 }
 
 void ApplicationInstance::QuitApplication() {
   queue_requests_ = true;
   application_->OnQuitRequested(
       base::Bind(&ApplicationInstance::OnQuitRequestedResult,
                  base::Unretained(this)));
 }
 
 void ApplicationInstance::CallAcceptConnection(
     scoped_ptr<ConnectToApplicationParams> params) {
   params->connect_callback().Run(requesting_content_handler_id_);
   AllowedInterfaces interfaces;
   interfaces.insert("*");
   if (!params->source().is_null())
     interfaces = GetAllowedInterfaces(params->source().filter(), identity_);
 
   application_->AcceptConnection(
       params->source().url().spec(), params->TakeServices(),
-      params->TakeExposedServices(), Array<String>::From(interfaces).Pass(),
+      params->TakeExposedServices(), Array<String>::From(interfaces),
       params->target().url().spec());
 }
 
 void ApplicationInstance::OnConnectionError() {
   std::vector<ConnectToApplicationParams*> queued_client_requests;
   queued_client_requests_.swap(queued_client_requests);
   auto manager = manager_;
   manager_->OnApplicationInstanceError(this);
   //|this| is deleted.
 
@@ skipping 14 matching lines @@
     // 6) connect_request_2 is queued (and eventually gets here), but its
     //    original_request field was already lost to NetworkFetcher at step (2).
     //
     // TODO(yzshen): It seems we should register a pending application instance
     // before starting the fetch. So at step (2) the application manager knows
     // that it can wait for the first fetch to complete instead of doing a
     // second one directly.
     if (!request->target_url_request()) {
       URLRequestPtr url_request = mojo::URLRequest::New();
       url_request->url = request->target().url().spec();
-      request->SetTargetURLRequest(url_request.Pass(), request->target());
+      request->SetTargetURLRequest(std::move(url_request), request->target());
     }
     manager->ConnectToApplication(make_scoped_ptr(request));
   }
 }
 
 void ApplicationInstance::OnQuitRequestedResult(bool can_quit) {
   if (can_quit)
     return;
 
   queue_requests_ = false;
   for (auto request : queued_client_requests_)
     CallAcceptConnection(make_scoped_ptr(request));
 
   queued_client_requests_.clear();
 }
 
 }  // namespace shell
 }  // namespace mojo