Make ApplicationTestBase not use ApplicationImpl.

services/js/pingpong_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 "mojo/public/cpp/application/connect.h"
 #include "services/js/test/js_application_test_base.h"
 #include "services/js/test/pingpong_service.mojom.h"
 
 namespace js {
 namespace {
@@ skipping 28 matching lines @@
 class JSPingPongTest : public test::JSApplicationTestBase {
  public:
   JSPingPongTest() : JSApplicationTestBase() {}
   ~JSPingPongTest() override {}
 
  protected:
   // ApplicationTestBase:
   void SetUp() override {
     ApplicationTestBase::SetUp();
     const std::string& url = JSAppURL("pingpong.js");
-    mojo::ConnectToService(application_impl()->shell(), url,
-                           GetProxy(&pingpong_service_));
+    mojo::ConnectToService(shell(), url, GetProxy(&pingpong_service_));
     PingPongClientPtr client_ptr;
     pingpong_client_.Bind(GetProxy(&client_ptr));
     pingpong_service_->SetClient(client_ptr.Pass());
   }
 
   PingPongServicePtr pingpong_service_;
   PingPongClientImpl pingpong_client_;
 
  private:
   MOJO_DISALLOW_COPY_AND_ASSIGN(JSPingPongTest);
@@ skipping 26 matching lines @@
   pingpong_service_->PingTargetURL(JSAppURL("pingpong_target.js"), 9, callback);
   EXPECT_TRUE(pingpong_service_.WaitForIncomingResponse());
   EXPECT_TRUE(returned_value);
   pingpong_service_->Quit();
 }
 
 // Same as the previous test except that instead of providing the
 // pingpong-target.js URL, we provide a connection to its PingPongService.
 TEST_F(JSPingPongTest, PingTargetService) {
   PingPongServicePtr target;
-  mojo::ConnectToService(application_impl()->shell(),
-                         JSAppURL("pingpong_target.js"), GetProxy(&target));
+  mojo::ConnectToService(shell(), JSAppURL("pingpong_target.js"),
+                         GetProxy(&target));
   bool returned_value = false;
   PingTargetCallback callback(&returned_value);
   pingpong_service_->PingTargetService(target.Pass(), 9, callback);
   EXPECT_TRUE(pingpong_service_.WaitForIncomingResponse());
   EXPECT_TRUE(returned_value);
   pingpong_service_->Quit();
 }
 
 // Verify that JS can implement an interface& "request" parameter.
 TEST_F(JSPingPongTest, GetTargetService) {
   PingPongServicePtr target;
   PingPongClientImpl client;
   pingpong_service_->GetPingPongService(GetProxy(&target));
   PingPongClientPtr client_ptr;
   client.Bind(GetProxy(&client_ptr));
   target->SetClient(client_ptr.Pass());
   target->Ping(1);
   EXPECT_EQ(2, client.WaitForPongValue());
   target->Ping(100);
   EXPECT_EQ(101, client.WaitForPongValue());
   target->Quit();
   pingpong_service_->Quit();
 }
 
 
 }  // namespace
 }  // namespace js