Mojo: Use InterfaceFactory<Interface> for service registration

mojo/shell/network_service_loader.h

Index: mojo/shell/network_service_loader.h
diff --git a/mojo/shell/network_service_loader.h b/mojo/shell/network_service_loader.h
index 257f70b3ba128935eae367412cab514e7baf34dd..2184072f6152a2b783f80060645b243249a3e3cf 100644
--- a/mojo/shell/network_service_loader.h
+++ b/mojo/shell/network_service_loader.h
@@ -10,17 +10,21 @@
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/memory/scoped_ptr.h"
 #include "mojo/public/cpp/application/application_delegate.h"
+#include "mojo/public/cpp/application/interface_factory.h"
 #include "mojo/service_manager/service_loader.h"
 #include "mojo/services/network/network_context.h"
 
 namespace mojo {
 
 class ApplicationImpl;
+class NetworkService;
 
 namespace shell {
 
 // ServiceLoader responsible for creating connections to the NetworkService.
-class NetworkServiceLoader : public ServiceLoader, public ApplicationDelegate {
+class NetworkServiceLoader : public ServiceLoader,
+                             public ApplicationDelegate,
+                             public InterfaceFactory<NetworkService> {
  public:
   NetworkServiceLoader();
   virtual ~NetworkServiceLoader();
@@ -35,9 +39,13 @@ class NetworkServiceLoader : public ServiceLoader, public ApplicationDelegate {
                               const GURL& url) OVERRIDE;
 
   // ApplicationDelegate overrides.
-  virtual void Initialize(ApplicationImpl* app) MOJO_OVERRIDE;
+  virtual void Initialize(ApplicationImpl* app) OVERRIDE;
   virtual bool ConfigureIncomingConnection(ApplicationConnection* connection)
-      MOJO_OVERRIDE;
+      OVERRIDE;
+
+  // InterfaceFactory<NetworkService> overrides.
+  virtual void Create(ApplicationConnection* connection,
+                      InterfaceRequest<NetworkService> request) OVERRIDE;
 
   base::ScopedPtrHashMap<uintptr_t, ApplicationImpl> apps_;
   scoped_ptr<NetworkContext> context_;