Simple multi-url support for mojo apps.
This patch makes it so that querystrings are no longer considered part of a mojo application's identity.
So if you connect to http://a?foo, then http://a?bar, you'll end up talking to the same application, just two different connections.
The URL of each connection is sent to the app via a new param in AcceptConnection().
This patch also adds some app tests that exercise http app loading, which wasn't tested before.
R=qsr@chromium.org
Review URL: https://codereview.chromium.org/943053003
diff --git a/shell/test/pingable_app.cc b/shell/test/pingable_app.cc
new file mode 100644
index 0000000..a22ddbe
--- /dev/null
+++ b/shell/test/pingable_app.cc
@@ -0,0 +1,69 @@
+// 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 "mojo/public/c/system/main.h"
+#include "mojo/public/cpp/application/application_delegate.h"
+#include "mojo/public/cpp/application/application_impl.h"
+#include "mojo/public/cpp/application/application_runner.h"
+#include "mojo/public/cpp/application/interface_factory.h"
+#include "mojo/public/cpp/bindings/callback.h"
+#include "mojo/public/cpp/bindings/interface_request.h"
+#include "mojo/public/cpp/bindings/strong_binding.h"
+#include "shell/test/pingable.mojom.h"
+
+namespace mojo {
+
+class PingableImpl : public Pingable {
+ public:
+ PingableImpl(InterfaceRequest<Pingable> request,
+ const std::string& app_url,
+ const std::string& connection_url)
+ : binding_(this, request.Pass()),
+ app_url_(app_url),
+ connection_url_(connection_url) {}
+
+ ~PingableImpl() override {}
+
+ private:
+ void Ping(const String& message,
+ const Callback<void(String, String, String)>& callback) override {
+ callback.Run(app_url_, connection_url_, message);
+ }
+
+ StrongBinding<Pingable> binding_;
+ std::string app_url_;
+ std::string connection_url_;
+};
+
+class PingableApp : public mojo::ApplicationDelegate,
+ public mojo::InterfaceFactory<Pingable> {
+ public:
+ PingableApp() {}
+ ~PingableApp() {}
+
+ private:
+ // ApplicationDelegate:
+ void Initialize(ApplicationImpl* impl) override { app_url_ = impl->url(); }
+
+ bool ConfigureIncomingConnection(
+ mojo::ApplicationConnection* connection) override {
+ connection->AddService(this);
+ return true;
+ }
+
+ // InterfaceFactory<Pingable>:
+ void Create(mojo::ApplicationConnection* connection,
+ mojo::InterfaceRequest<Pingable> request) override {
+ new PingableImpl(request.Pass(), app_url_, connection->GetConnectionURL());
+ }
+
+ std::string app_url_;
+};
+
+} // namespace mojo
+
+MojoResult MojoMain(MojoHandle shell_handle) {
+ mojo::ApplicationRunner runner(new mojo::PingableApp);
+ return runner.Run(shell_handle);
+}
