Pass application ids via AcceptConnection & ConnectToApplication callback.

mojo/shell/public/cpp/lib/application_test_base.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 <utility>
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/system/message_pipe.h"
 #include "mojo/shell/public/cpp/application_impl.h"
 #include "mojo/shell/public/cpp/application_test_base.h"
 #include "mojo/shell/public/interfaces/application.mojom.h"
 
 namespace mojo {
 namespace test {
 
 namespace {
 // Share the application URL with multiple application tests.
 String g_url;
+uint32_t g_id = Shell::kInvalidApplicationID;
 
 // Application request handle passed from the shell in MojoMain, stored in
 // between SetUp()/TearDown() so we can (re-)intialize new ApplicationImpls.
 InterfaceRequest<Application> g_application_request;
 
 // Shell pointer passed in the initial mojo.Application.Initialize() call,
 // stored in between initial setup and the first test and between SetUp/TearDown
 // calls so we can (re-)initialize new ApplicationImpls.
 ShellPtr g_shell;
 
 class ShellGrabber : public Application {
  public:
   explicit ShellGrabber(InterfaceRequest<Application> application_request)
       : binding_(this, std::move(application_request)) {}
 
   void WaitForInitialize() {
     // Initialize is always the first call made on Application.
     MOJO_CHECK(binding_.WaitForIncomingMethodCall());
   }
 
  private:
   // Application implementation.
-  void Initialize(ShellPtr shell, const mojo::String& url) override {
+  void Initialize(ShellPtr shell,
+                  const mojo::String& url,
+                  uint32_t id) override {
     g_url = url;
+    g_id = id;
     g_application_request = binding_.Unbind();
     g_shell = std::move(shell);
   }
 
   void AcceptConnection(const String& requestor_url,
+                        uint32_t requestor_id,
                         InterfaceRequest<ServiceProvider> services,
                         ServiceProviderPtr exposed_services,
                         Array<String> allowed_interfaces,
                         const String& url) override {
     MOJO_CHECK(false);
   }
 
   void OnQuitRequested(const Callback<void(bool)>& callback) override {
     MOJO_CHECK(false);
   }
@@ skipping 64 matching lines @@
 
   MOJO_CHECK(g_application_request.is_pending());
   MOJO_CHECK(g_shell);
 
   // New applications are constructed for each test to avoid persisting state.
   application_impl_ = new ApplicationImpl(GetApplicationDelegate(),
                                           std::move(g_application_request));
 
   // Fake application initialization.
   Application* application = application_impl_;
-  application->Initialize(std::move(g_shell), g_url);
+  application->Initialize(std::move(g_shell), g_url, g_id);
 }
 
 void ApplicationTestBase::TearDown() {
   MOJO_CHECK(!g_application_request.is_pending());
   MOJO_CHECK(!g_shell);
 
   // TODO: commented out until http://crbug.com/533107 is solved.
   // {
   // ApplicationImpl::TestApi test_api(application_impl_);
   // test_api.UnbindConnections(&g_application_request, &g_shell);
   // }
   delete application_impl_;
   if (ShouldCreateDefaultRunLoop())
     Environment::DestroyDefaultRunLoop();
 }
 
 bool ApplicationTestBase::ShouldCreateDefaultRunLoop() {
   return true;
 }
 
 
 }  // namespace test
 }  // namespace mojo