Move mojo/runner to mojo/shell/standalone

mojo/shell/standalone/shell_apptest.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 <stdint.h>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #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 {
 
 std::string GetURL(uint16_t port, const std::string& path) {
   return base::StringPrintf("http://127.0.0.1:%u/%s",
                             static_cast<unsigned>(port), path.c_str());
 }
 
 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:
   // http_server::HttpHandler:
   void HandleRequest(
       http_server::HttpRequestPtr request,
       const Callback<void(http_server::HttpResponsePtr)>& callback) override {
     http_server::HttpResponsePtr response;
     if (base::StartsWith(request->relative_url, "/app",
                          base::CompareCase::SENSITIVE)) {
       response = http_server::CreateHttpResponse(
           200, std::string(kPingable.data, kPingable.size));
       response->content_type = "application/octet-stream";
     } else if (request->relative_url == "/redirect") {
       response = http_server::HttpResponse::New();
       response->status_code = 302;
       response->custom_headers.insert("Location", GetURL(port_, "app"));
     } else {
       NOTREACHED();
     }
 
-    callback.Run(response.Pass());
+    callback.Run(std::move(response));
   }
 
   Binding<http_server::HttpHandler> binding_;
   uint16_t port_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(GetHandler);
 };
 
 typedef test::ApplicationTestBase ShellAppTest;
 
@@ skipping 13 matching lines @@
     NetAddressPtr local_address(NetAddress::New());
     local_address->family = NET_ADDRESS_FAMILY_IPV4;
     local_address->ipv4 = NetAddressIPv4::New();
     local_address->ipv4->addr.resize(4);
     local_address->ipv4->addr[0] = 127;
     local_address->ipv4->addr[1] = 0;
     local_address->ipv4->addr[2] = 0;
     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());
   }
 
   std::string GetURL(const std::string& path) {
     return ::mojo::GetURL(port_, path);
   }
 
   http_server::HttpServerFactoryPtr http_server_factory_;
   http_server::HttpServerPtr http_server_;
@@ skipping 80 matching lines @@
     EXPECT_EQ(app_url.To<std::string>() + "?foo", connection_url);
     EXPECT_EQ("hello", message);
     base::MessageLoop::current()->QuitWhenIdle();
   };
   pingable->Ping("hello", callback);
   base::RunLoop().Run();
 }
 
 }  // namespace
 }  // namespace mojo