Bundle the network service in the shell on Android.

mojo/shell/network_service_loader.h

Index: mojo/shell/network_service_loader.h
diff --git a/mojo/shell/profile_service_loader.h b/mojo/shell/network_service_loader.h
similarity index 64%
rename from mojo/shell/profile_service_loader.h
rename to mojo/shell/network_service_loader.h
index bbb5d821d516c4cddc8efe0b162572ccc0109eb1..257f70b3ba128935eae367412cab514e7baf34dd 100644
--- a/mojo/shell/profile_service_loader.h
+++ b/mojo/shell/network_service_loader.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_SHELL_PROFILE_SERVICE_LOADER_H_
-#define MOJO_SHELL_PROFILE_SERVICE_LOADER_H_
+#ifndef MOJO_SHELL_NETWORK_SERVICE_LOADER_H_
+#define MOJO_SHELL_NETWORK_SERVICE_LOADER_H_
 
 #include <map>
 
@@ -11,6 +11,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/service_manager/service_loader.h"
+#include "mojo/services/network/network_context.h"
 
 namespace mojo {
 
@@ -18,11 +19,11 @@ class ApplicationImpl;
 
 namespace shell {
 
-// ServiceLoader responsible for creating connections to the ProfileService.
-class ProfileServiceLoader : public ServiceLoader, public ApplicationDelegate {
+// ServiceLoader responsible for creating connections to the NetworkService.
+class NetworkServiceLoader : public ServiceLoader, public ApplicationDelegate {
  public:
-  ProfileServiceLoader();
-  virtual ~ProfileServiceLoader();
+  NetworkServiceLoader();
+  virtual ~NetworkServiceLoader();
 
  private:
   // ServiceLoader overrides:
@@ -34,15 +35,17 @@ class ProfileServiceLoader : public ServiceLoader, public ApplicationDelegate {
                               const GURL& url) OVERRIDE;
 
   // ApplicationDelegate overrides.
+  virtual void Initialize(ApplicationImpl* app) MOJO_OVERRIDE;
   virtual bool ConfigureIncomingConnection(ApplicationConnection* connection)
       MOJO_OVERRIDE;
 
   base::ScopedPtrHashMap<uintptr_t, ApplicationImpl> apps_;
+  scoped_ptr<NetworkContext> context_;
 
-  DISALLOW_COPY_AND_ASSIGN(ProfileServiceLoader);
+  DISALLOW_COPY_AND_ASSIGN(NetworkServiceLoader);
 };
 
 }  // namespace shell
 }  // namespace mojo
 
-#endif  // MOJO_SHELL_PROFILE_SERVICE_LOADER_H_
+#endif  // MOJO_SHELL_NETWORK_SERVICE_LOADER_H_