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

mojo/shell/application_manager_unittest.cc

Index: mojo/shell/application_manager_unittest.cc
diff --git a/mojo/shell/application_manager_unittest.cc b/mojo/shell/application_manager_unittest.cc
index 1687ecc2ccf3ca7d42e6238e99e2884e34e2464e..6da5557a06bf84eac6387cd0c3fb941fee2554d1 100644
--- a/mojo/shell/application_manager_unittest.cc
+++ b/mojo/shell/application_manager_unittest.cc
@@ -2,6 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "mojo/shell/application_manager.h"
+
+#include <utility>
+
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/macros.h"
@@ -15,7 +19,6 @@
 #include "mojo/application/public/interfaces/service_provider.mojom.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/shell/application_loader.h"
-#include "mojo/shell/application_manager.h"
 #include "mojo/shell/connect_util.h"
 #include "mojo/shell/fetcher.h"
 #include "mojo/shell/package_manager.h"
@@ -46,7 +49,7 @@ void QuitClosure(bool* value) {
 class TestServiceImpl : public TestService {
  public:
   TestServiceImpl(TestContext* context, InterfaceRequest<TestService> request)
-      : context_(context), binding_(this, request.Pass()) {
+      : context_(context), binding_(this, std::move(request)) {
     ++context_->num_impls;
   }
 
@@ -72,7 +75,7 @@ class TestServiceImpl : public TestService {
 class TestClient {
  public:
   explicit TestClient(TestServicePtr service)
-      : service_(service.Pass()), quit_after_ack_(false) {}
+      : service_(std::move(service)), quit_after_ack_(false) {}
 
   void AckTest() {
     if (quit_after_ack_)
@@ -113,7 +116,7 @@ class TestApplicationLoader : public ApplicationLoader,
   void Load(const GURL& url,
             InterfaceRequest<Application> application_request) override {
     ++num_loads_;
-    test_app_.reset(new ApplicationImpl(this, application_request.Pass()));
+    test_app_.reset(new ApplicationImpl(this, std::move(application_request)));
   }
 
   // ApplicationDelegate implementation.
@@ -126,7 +129,7 @@ class TestApplicationLoader : public ApplicationLoader,
   // InterfaceFactory<TestService> implementation.
   void Create(ApplicationConnection* connection,
               InterfaceRequest<TestService> request) override {
-    new TestServiceImpl(context_, request.Pass());
+    new TestServiceImpl(context_, std::move(request));
   }
 
   scoped_ptr<ApplicationImpl> test_app_;
@@ -245,7 +248,7 @@ class TestAImpl : public TestA {
   TestAImpl(ApplicationImpl* app_impl,
             TesterContext* test_context,
             InterfaceRequest<TestA> request)
-      : test_context_(test_context), binding_(this, request.Pass()) {
+      : test_context_(test_context), binding_(this, std::move(request)) {
     connection_ = app_impl->ConnectToApplication(kTestBURLString);
     connection_->ConnectToService(&b_);
   }
@@ -282,7 +285,7 @@ class TestBImpl : public TestB {
   TestBImpl(ApplicationConnection* connection,
             TesterContext* test_context,
             InterfaceRequest<TestB> request)
-      : test_context_(test_context), binding_(this, request.Pass()) {
+      : test_context_(test_context), binding_(this, std::move(request)) {
     connection->ConnectToService(&c_);
   }
 
@@ -314,7 +317,7 @@ class TestCImpl : public TestC {
   TestCImpl(ApplicationConnection* connection,
             TesterContext* test_context,
             InterfaceRequest<TestC> request)
-      : test_context_(test_context), binding_(this, request.Pass()) {}
+      : test_context_(test_context), binding_(this, std::move(request)) {}
 
   ~TestCImpl() override { test_context_->IncrementNumCDeletes(); }
 
@@ -341,7 +344,7 @@ class Tester : public ApplicationDelegate,
  private:
   void Load(const GURL& url,
             InterfaceRequest<Application> application_request) override {
-    app_.reset(new ApplicationImpl(this, application_request.Pass()));
+    app_.reset(new ApplicationImpl(this, std::move(application_request)));
   }
 
   bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
@@ -369,17 +372,18 @@ class Tester : public ApplicationDelegate,
 
   void Create(ApplicationConnection* connection,
               InterfaceRequest<TestA> request) override {
-    a_bindings_.push_back(new TestAImpl(app_.get(), context_, request.Pass()));
+    a_bindings_.push_back(
+        new TestAImpl(app_.get(), context_, std::move(request)));
   }
 
   void Create(ApplicationConnection* connection,
               InterfaceRequest<TestB> request) override {
-    new TestBImpl(connection, context_, request.Pass());
+    new TestBImpl(connection, context_, std::move(request));
   }
 
   void Create(ApplicationConnection* connection,
               InterfaceRequest<TestC> request) override {
-    new TestCImpl(connection, context_, request.Pass());
+    new TestCImpl(connection, context_, std::move(request));
   }
 
   TesterContext* context_;
@@ -405,7 +409,7 @@ class ApplicationManagerTest : public testing::Test {
     TestServicePtr service_proxy;
     ConnectToService(application_manager_.get(), GURL(kTestURLString),
                      &service_proxy);
-    test_client_.reset(new TestClient(service_proxy.Pass()));
+    test_client_.reset(new TestClient(std::move(service_proxy)));
   }
 
   void TearDown() override {
@@ -590,7 +594,7 @@ TEST_F(ApplicationManagerTest, TestEndApplicationClosure) {
   params->SetTargetURL(GURL("test:test"));
   params->set_on_application_end(
       base::Bind(&QuitClosure, base::Unretained(&called)));
-  application_manager_->ConnectToApplication(params.Pass());
+  application_manager_->ConnectToApplication(std::move(params));
   loop_.Run();
   EXPECT_TRUE(called);
 }