Make ApplicationTestBase not use ApplicationImpl.

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 "mojo/public/cpp/application/connect.h"
 #include "mojo/public/cpp/bindings/synchronous_interface_ptr.h"
 #include "services/js/test/echo_service.mojom-sync.h"
 #include "services/js/test/js_application_test_base.h"
 
 using mojo::String;
 
 namespace js {
 namespace {
 
 class JSEchoTest : public test::JSApplicationTestBase {
  public:
   JSEchoTest() : JSApplicationTestBase() {}
   ~JSEchoTest() override {}
 
  protected:
   // ApplicationTestBase:
   void SetUp() override {
     ApplicationTestBase::SetUp();
     const std::string& url = JSAppURL("echo.js");
-    mojo::ConnectToService(application_impl()->shell(), url,
-                           GetSynchronousProxy(&echo_service_));
+    mojo::ConnectToService(shell(), url, GetSynchronousProxy(&echo_service_));
   }
 
   mojo::SynchronousInterfacePtr<mojo::EchoService> echo_service_;
 
  private:
   MOJO_DISALLOW_COPY_AND_ASSIGN(JSEchoTest);
 };
 
 class JSServiceProviderEchoTest : public test::JSApplicationTestBase {
  public:
   JSServiceProviderEchoTest() : JSApplicationTestBase() {}
   ~JSServiceProviderEchoTest() override {}
 
  protected:
   // ApplicationTestBase:
   void SetUp() override {
     ApplicationTestBase::SetUp();
     const std::string& url = JSAppURL("echo.js");
-    application_impl()->shell()->ConnectToApplication(
-        url, GetProxy(&echo_service_provider_), nullptr);
+    shell()->ConnectToApplication(url, GetProxy(&echo_service_provider_),
+                                  nullptr);
   }
 
   mojo::ServiceProviderPtr echo_service_provider_;
 
  private:
   MOJO_DISALLOW_COPY_AND_ASSIGN(JSServiceProviderEchoTest);
 };
 
 TEST_F(JSEchoTest, EchoString) {
   String foo;
@@ skipping 11 matching lines @@
 
 TEST_F(JSEchoTest, EchoNullString) {
   String null;
   EXPECT_TRUE(echo_service_->EchoString(nullptr, &null));
   EXPECT_TRUE(null.is_null());
   echo_service_->Quit();
 }
 
 } // namespace
 } // namespace js