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

mojo/services/network/http_server_apptest.cc

Index: mojo/services/network/http_server_apptest.cc
diff --git a/mojo/services/network/http_server_apptest.cc b/mojo/services/network/http_server_apptest.cc
index 4fda6c0c67c9301ac9ccc7afec6aae5e7785e3d3..34f5161d0e197c3a717ea180236903f2b2aaa252 100644
--- a/mojo/services/network/http_server_apptest.cc
+++ b/mojo/services/network/http_server_apptest.cc
@@ -27,7 +27,6 @@
 #include "mojo/services/network/public/interfaces/web_socket.mojom.h"
 #include "mojo/services/network/public/interfaces/web_socket_factory.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/io_buffer.h"
 #include "net/base/net_errors.h"
@@ -559,7 +558,7 @@ class HttpServerAppTest : public test::ApplicationTestBase {
     ApplicationTestBase::SetUp();
 
     scoped_ptr<ApplicationConnection> connection =
-        application_impl()->ConnectToApplication("mojo:network_service");
+        shell()->ConnectToApplication("mojo:network_service");
     connection->ConnectToService(&network_service_);
     connection->ConnectToService(&web_socket_factory_);
   }