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

mojo/public/cpp/bindings/tests/router_unittest.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 "mojo/public/cpp/bindings/lib/router.h"
+
+#include <utility>
+
 #include "base/message_loop/message_loop.h"
 #include "mojo/message_pump/message_pump_mojo.h"
-#include "mojo/public/cpp/bindings/lib/router.h"
 #include "mojo/public/cpp/bindings/tests/message_queue.h"
 #include "mojo/public/cpp/bindings/tests/router_test_util.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace test {
 namespace {
 
 class RouterTest : public testing::Test {
@@ skipping 10 matching lines @@
 
  protected:
   ScopedMessagePipeHandle handle0_;
   ScopedMessagePipeHandle handle1_;
 
  private:
   base::MessageLoop loop_;
 };
 
 TEST_F(RouterTest, BasicRequestResponse) {
-  internal::Router router0(handle0_.Pass(), internal::FilterChain());
-  internal::Router router1(handle1_.Pass(), internal::FilterChain());
+  internal::Router router0(std::move(handle0_), internal::FilterChain());
+  internal::Router router1(std::move(handle1_), internal::FilterChain());
 
   ResponseGenerator generator;
   router1.set_incoming_receiver(&generator);
 
   Message request;
   AllocRequestMessage(1, "hello", &request);
 
   MessageQueue message_queue;
   router0.AcceptWithResponder(&request, new MessageAccumulator(&message_queue));
 
@@ skipping 18 matching lines @@
 
   EXPECT_FALSE(message_queue.IsEmpty());
 
   message_queue.Pop(&response);
 
   EXPECT_EQ(std::string("hello again world!"),
             std::string(reinterpret_cast<const char*>(response.payload())));
 }
 
 TEST_F(RouterTest, BasicRequestResponse_Synchronous) {
-  internal::Router router0(handle0_.Pass(), internal::FilterChain());
-  internal::Router router1(handle1_.Pass(), internal::FilterChain());
+  internal::Router router0(std::move(handle0_), internal::FilterChain());
+  internal::Router router1(std::move(handle1_), internal::FilterChain());
 
   ResponseGenerator generator;
   router1.set_incoming_receiver(&generator);
 
   Message request;
   AllocRequestMessage(1, "hello", &request);
 
   MessageQueue message_queue;
   router0.AcceptWithResponder(&request, new MessageAccumulator(&message_queue));
 
@@ skipping 20 matching lines @@
 
   EXPECT_FALSE(message_queue.IsEmpty());
 
   message_queue.Pop(&response);
 
   EXPECT_EQ(std::string("hello again world!"),
             std::string(reinterpret_cast<const char*>(response.payload())));
 }
 
 TEST_F(RouterTest, RequestWithNoReceiver) {
-  internal::Router router0(handle0_.Pass(), internal::FilterChain());
-  internal::Router router1(handle1_.Pass(), internal::FilterChain());
+  internal::Router router0(std::move(handle0_), internal::FilterChain());
+  internal::Router router1(std::move(handle1_), internal::FilterChain());
 
   // Without an incoming receiver set on router1, we expect router0 to observe
   // an error as a result of sending a message.
 
   Message request;
   AllocRequestMessage(1, "hello", &request);
 
   MessageQueue message_queue;
   router0.AcceptWithResponder(&request, new MessageAccumulator(&message_queue));
 
   PumpMessages();
 
   EXPECT_TRUE(router0.encountered_error());
   EXPECT_TRUE(router1.encountered_error());
   EXPECT_TRUE(message_queue.IsEmpty());
 }
 
 // Tests Router using the LazyResponseGenerator. The responses will not be
 // sent until after the requests have been accepted.
 TEST_F(RouterTest, LazyResponses) {
-  internal::Router router0(handle0_.Pass(), internal::FilterChain());
-  internal::Router router1(handle1_.Pass(), internal::FilterChain());
+  internal::Router router0(std::move(handle0_), internal::FilterChain());
+  internal::Router router1(std::move(handle1_), internal::FilterChain());
 
   LazyResponseGenerator generator;
   router1.set_incoming_receiver(&generator);
 
   Message request;
   AllocRequestMessage(1, "hello", &request);
 
   MessageQueue message_queue;
   router0.AcceptWithResponder(&request, new MessageAccumulator(&message_queue));
   PumpMessages();
@@ skipping 33 matching lines @@
   EXPECT_FALSE(message_queue.IsEmpty());
   message_queue.Pop(&response);
   EXPECT_EQ(std::string("hello again world!"),
             std::string(reinterpret_cast<const char*>(response.payload())));
 }
 
 // Tests that if the receiving application destroys the responder_ without
 // sending a response, then we trigger connection error at both sides. Moreover,
 // both sides still appear to have a valid message pipe handle bound.
 TEST_F(RouterTest, MissingResponses) {
-  internal::Router router0(handle0_.Pass(), internal::FilterChain());
+  internal::Router router0(std::move(handle0_), internal::FilterChain());
   bool error_handler_called0 = false;
   router0.set_connection_error_handler(
       [&error_handler_called0]() { error_handler_called0 = true; });
 
-  internal::Router router1(handle1_.Pass(), internal::FilterChain());
+  internal::Router router1(std::move(handle1_), internal::FilterChain());
   bool error_handler_called1 = false;
   router1.set_connection_error_handler(
       [&error_handler_called1]() { error_handler_called1 = true; });
 
   LazyResponseGenerator generator;
   router1.set_incoming_receiver(&generator);
 
   Message request;
   AllocRequestMessage(1, "hello", &request);
 
@@ skipping 24 matching lines @@
   EXPECT_TRUE(router1.is_valid());
 }
 
 TEST_F(RouterTest, LateResponse) {
   // Test that things won't blow up if we try to send a message to a
   // MessageReceiver, which was given to us via AcceptWithResponder,
   // after the router has gone away.
 
   LazyResponseGenerator generator;
   {
-    internal::Router router0(handle0_.Pass(), internal::FilterChain());
-    internal::Router router1(handle1_.Pass(), internal::FilterChain());
+    internal::Router router0(std::move(handle0_), internal::FilterChain());
+    internal::Router router1(std::move(handle1_), internal::FilterChain());
 
     router1.set_incoming_receiver(&generator);
 
     Message request;
     AllocRequestMessage(1, "hello", &request);
 
     MessageQueue message_queue;
     router0.AcceptWithResponder(&request,
                                 new MessageAccumulator(&message_queue));
 
     PumpMessages();
 
     EXPECT_TRUE(generator.has_responder());
   }
 
   EXPECT_FALSE(generator.responder_is_valid());
   generator.CompleteWithResponse();  // This should end up doing nothing.
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace mojo