Extract shell methods from ApplicationImpl into a base class, and pass this to Initialize() instead.

mojo/services/network/udp_socket_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 <stddef.h>
 #include <stdint.h>
 
 #include <utility>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "mojo/public/cpp/bindings/callback.h"
 #include "mojo/services/network/public/cpp/udp_socket_wrapper.h"
 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
 #include "mojo/services/network/public/interfaces/udp_socket.mojom.h"
 #include "mojo/shell/public/cpp/application_connection.h"
-#include "mojo/shell/public/cpp/application_impl.h"
 #include "mojo/shell/public/cpp/application_test_base.h"
 #include "net/base/net_errors.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace service {
 namespace {
 
 NetAddressPtr GetLocalHostWithAnyPort() {
   NetAddressPtr addr(NetAddress::New());
@@ skipping 290 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(UDPSocketReceiverImpl);
 };
 
 class UDPSocketAppTest : public test::ApplicationTestBase {
  public:
   UDPSocketAppTest() : receiver_binding_(&receiver_) {}
   ~UDPSocketAppTest() override {}
 
   void SetUp() override {
     ApplicationTestBase::SetUp();
-    application_impl()->ConnectToService("mojo:network_service",
-                                         &network_service_);
+    shell()->ConnectToService("mojo:network_service", &network_service_);
     network_service_->CreateUDPSocket(GetProxy(&socket_));
   }
 
  protected:
   NetworkServicePtr network_service_;
   UDPSocketPtr socket_;
   UDPSocketReceiverImpl receiver_;
   Binding<UDPSocketReceiver> receiver_binding_;
 
   DISALLOW_COPY_AND_ASSIGN(UDPSocketAppTest);
@@ skipping 304 matching lines @@
                 receive_callbacks[j].result()->code);
       EXPECT_FALSE(receive_callbacks[j].src_addr());
       EXPECT_TRUE(receive_callbacks[j].data().Equals(
           CreateTestMessage(static_cast<uint8_t>(j), kDatagramSize)));
     }
   }
 }
 
 }  // namespace service
 }  // namespace mojo