Pass ServiceProvider and ServiceProvider& params in Connect

services/js/echo_apptest.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 "services/js/test/echo_service.mojom.h"
 #include "services/js/test/js_application_test_base.h"
 
 using mojo::String;
 
 namespace js {
@@ skipping 21 matching lines @@
 class JSServiceProviderEchoTest : public test::JSApplicationTestBase {
  public:
   JSServiceProviderEchoTest() : JSApplicationTestBase() {}
   ~JSServiceProviderEchoTest() override {}
 
  protected:
   // ApplicationTestBase:
   void SetUp() override {
     ApplicationTestBase::SetUp();
     const std::string& url = JSAppURL("echo.js");
+    // TODO(hansmuller): We should be able to pass a null ServiceProviderPtr
+    // here as the third parameter to ConnectToApplication since the parameter
+    // is annotated as nullable in the mojom, but the JS bindings currently
+    // don't correctly handle a null handle. So instead we allocate (and
+    // immediately close) a MessagePipe.
+    mojo::MessagePipe throwaway_pipe;
+    mojo::ServiceProviderPtr exposed_services;
+    exposed_services.Bind(throwaway_pipe.handle0.Pass());
     application_impl()->shell()->ConnectToApplication(
-        url, GetProxy(&echo_service_provider_));
+        url, GetProxy(&echo_service_provider_), exposed_services.Pass());
   }
 
   mojo::ServiceProviderPtr echo_service_provider_;
 
  private:
   MOJO_DISALLOW_COPY_AND_ASSIGN(JSServiceProviderEchoTest);
 };
 
 struct EchoStringCallback {
   explicit EchoStringCallback(String *s) : echo_value(s) {}
@@ skipping 60 matching lines @@
   String foo;
   EchoStringCallback callback(&foo);
   echo_service->EchoString("foo", callback);
   EXPECT_TRUE(echo_service.WaitForIncomingMethodCall());
   EXPECT_EQ("foo", foo);
   echo_service->Quit();
 }
 
 } // namespace
 } // namespace js