Make ApplicationTestBase not use ApplicationImpl.

services/http_server/http_server_apptest.cc

 // 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 "base/bind.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "mojo/data_pipe_utils/data_pipe_utils.h"
-#include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/application_test_base.h"
 #include "mojo/public/cpp/application/connect.h"
+#include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/synchronous_interface_ptr.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "mojo/services/http_server/cpp/http_server_util.h"
 #include "mojo/services/http_server/interfaces/http_server.mojom-sync.h"
 #include "mojo/services/http_server/interfaces/http_server_factory.mojom.h"
 #include "mojo/services/network/interfaces/net_address.mojom.h"
 #include "mojo/services/network/interfaces/network_service.mojom.h"
 #include "mojo/services/network/interfaces/url_loader.mojom.h"
 
 namespace http_server {
@@ skipping 72 matching lines @@
 class HttpServerApplicationTest : public mojo::test::ApplicationTestBase {
  public:
   HttpServerApplicationTest() : ApplicationTestBase() {}
   ~HttpServerApplicationTest() override {}
 
  protected:
   // ApplicationTestBase:
   void SetUp() override {
     ApplicationTestBase::SetUp();
 
-    mojo::ConnectToService(application_impl()->shell(), "mojo:http_server",
+    mojo::ConnectToService(shell(), "mojo:http_server",
                            GetProxy(&http_server_factory_));
-    mojo::ConnectToService(application_impl()->shell(), "mojo:network_service",
+    mojo::ConnectToService(shell(), "mojo:network_service",
                            GetProxy(&network_service_));
   }
 
   mojo::SynchronousInterfacePtr<http_server::HttpServer> CreateHttpServer();
 
   http_server::HttpServerFactoryPtr http_server_factory_;
   mojo::NetworkServicePtr network_service_;
 
  private:
   MOJO_DISALLOW_COPY_AND_ASSIGN(HttpServerApplicationTest);
@@ skipping 78 matching lines @@
   url_request->method = "POST";
   url_request->body.resize(1);
   WriteMessageToDataPipe(kExampleMessage, &url_request->body[0]);
 
   url_loader->Start(url_request.Pass(), base::Bind(&CheckServerResponse));
   base::RunLoop run_loop;
   run_loop.Run();
 }
 
 }  // namespace http_server