Move mojo/runner to mojo/shell/standalone

mojo/shell/standalone/shell_apptest.cc

Index: mojo/shell/standalone/shell_apptest.cc
diff --git a/mojo/runner/shell_apptest.cc b/mojo/shell/standalone/shell_apptest.cc
similarity index 95%
rename from mojo/runner/shell_apptest.cc
rename to mojo/shell/standalone/shell_apptest.cc
index b1c57da4685382e95192ca2c7b03fb9ccf9df3fb..a8a5c5ba65167f31fc3e5b2bd577303210a59e10 100644
--- a/mojo/runner/shell_apptest.cc
+++ b/mojo/shell/standalone/shell_apptest.cc
@@ -14,14 +14,14 @@
 #include "base/strings/stringprintf.h"
 #include "mojo/common/data_pipe_utils.h"
 #include "mojo/public/cpp/system/macros.h"
-#include "mojo/runner/kPingable.h"
-#include "mojo/runner/test/pingable.mojom.h"
 #include "mojo/services/http_server/public/cpp/http_server_util.h"
 #include "mojo/services/http_server/public/interfaces/http_server.mojom.h"
 #include "mojo/services/http_server/public/interfaces/http_server_factory.mojom.h"
 #include "mojo/services/network/public/interfaces/net_address.mojom.h"
 #include "mojo/shell/public/cpp/application_impl.h"
 #include "mojo/shell/public/cpp/application_test_base.h"
+#include "mojo/shell/standalone/kPingable.h"
+#include "mojo/shell/standalone/test/pingable.mojom.h"
 
 namespace mojo {
 namespace {
@@ -34,8 +34,7 @@ std::string GetURL(uint16_t port, const std::string& path) {
 class GetHandler : public http_server::HttpHandler {
  public:
   GetHandler(InterfaceRequest<http_server::HttpHandler> request, uint16_t port)
-      : binding_(this, request.Pass()), port_(port) {
-  }
+      : binding_(this, std::move(request)), port_(port) {}
   ~GetHandler() override {}
 
  private:
@@ -57,7 +56,7 @@ class GetHandler : public http_server::HttpHandler {
       NOTREACHED();
     }
 
-    callback.Run(response.Pass());
+    callback.Run(std::move(response));
   }
 
   Binding<http_server::HttpHandler> binding_;
@@ -91,14 +90,14 @@ class ShellHTTPAppTest : public test::ApplicationTestBase {
     local_address->ipv4->addr[3] = 1;
     local_address->ipv4->port = 0;
     http_server_factory_->CreateHttpServer(GetProxy(&http_server_),
-                                           local_address.Pass());
+                                           std::move(local_address));
 
     http_server_->GetPort([this](uint16_t p) { port_ = p; });
     EXPECT_TRUE(http_server_.WaitForIncomingResponse());
 
     InterfacePtr<http_server::HttpHandler> http_handler;
     handler_.reset(new GetHandler(GetProxy(&http_handler).Pass(), port_));
-    http_server_->SetHandler(".*", http_handler.Pass(),
+    http_server_->SetHandler(".*", std::move(http_handler),
                              [](bool result) { EXPECT_TRUE(result); });
     EXPECT_TRUE(http_server_.WaitForIncomingResponse());
   }