Index: mojo/shell/standalone/test/pingable_app.cc |
diff --git a/mojo/runner/test/pingable_app.cc b/mojo/shell/standalone/test/pingable_app.cc |
similarity index 90% |
rename from mojo/runner/test/pingable_app.cc |
rename to mojo/shell/standalone/test/pingable_app.cc |
index e53a11c057d73e2016f2061ca86dc135b0f7f065..c8116aaf61c6364913a3ee3c7670d1f82bfdb552 100644 |
--- a/mojo/runner/test/pingable_app.cc |
+++ b/mojo/shell/standalone/test/pingable_app.cc |
@@ -6,11 +6,11 @@ |
#include "mojo/public/cpp/bindings/callback.h" |
#include "mojo/public/cpp/bindings/interface_request.h" |
#include "mojo/public/cpp/bindings/strong_binding.h" |
-#include "mojo/runner/test/pingable.mojom.h" |
#include "mojo/shell/public/cpp/application_delegate.h" |
#include "mojo/shell/public/cpp/application_impl.h" |
#include "mojo/shell/public/cpp/application_runner.h" |
#include "mojo/shell/public/cpp/interface_factory.h" |
+#include "mojo/shell/standalone/test/pingable.mojom.h" |
namespace mojo { |
@@ -19,7 +19,7 @@ class PingableImpl : public Pingable { |
PingableImpl(InterfaceRequest<Pingable> request, |
const std::string& app_url, |
const std::string& connection_url) |
- : binding_(this, request.Pass()), |
+ : binding_(this, std::move(request)), |
app_url_(app_url), |
connection_url_(connection_url) {} |
@@ -55,7 +55,8 @@ class PingableApp : public mojo::ApplicationDelegate, |
// InterfaceFactory<Pingable>: |
void Create(mojo::ApplicationConnection* connection, |
mojo::InterfaceRequest<Pingable> request) override { |
- new PingableImpl(request.Pass(), app_url_, connection->GetConnectionURL()); |
+ new PingableImpl(std::move(request), app_url_, |
+ connection->GetConnectionURL()); |
} |
std::string app_url_; |