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

mojo/services/network/network_service_delegate.h

 // 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.
 
 #ifndef MOJO_SERVICES_NETWORK_NETWORK_SERVICE_DELEGATE_H_
 #define MOJO_SERVICES_NETWORK_NETWORK_SERVICE_DELEGATE_H_
 
 #include "base/observer_list.h"
 #include "base/threading/thread.h"
 #include "components/filesystem/public/interfaces/file_system.mojom.h"
 #include "mojo/services/network/network_context.h"
 #include "mojo/services/network/public/interfaces/cookie_store.mojom.h"
 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
 #include "mojo/services/network/public/interfaces/url_loader_factory.mojom.h"
 #include "mojo/services/network/public/interfaces/web_socket_factory.mojom.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
 #include "mojo/shell/public/cpp/application_delegate.h"
-#include "mojo/shell/public/cpp/application_impl.h"
 #include "mojo/shell/public/cpp/interface_factory.h"
+#include "mojo/shell/public/cpp/shell.h"
 
 namespace sql {
 class ScopedMojoFilesystemVFS;
 }
 
 namespace mojo {
 class NetworkServiceDelegateObserver;
 
 class NetworkServiceDelegate : public ApplicationDelegate,
                                public InterfaceFactory<NetworkService>,
                                public InterfaceFactory<CookieStore>,
                                public InterfaceFactory<WebSocketFactory>,
                                public InterfaceFactory<URLLoaderFactory>,
                                public filesystem::FileSystemClient {
  public:
   NetworkServiceDelegate();
   ~NetworkServiceDelegate() override;
 
   void AddObserver(NetworkServiceDelegateObserver* observer);
   void RemoveObserver(NetworkServiceDelegateObserver* observer);
 
  private:
   // Notifies all of our observers of a Shuts down our IO thread. Safe to call
   // multiple times.
   void EnsureIOThreadShutdown();
 
   // ApplicationDelegate implementation.
-  void Initialize(ApplicationImpl* app) override;
+  void Initialize(Shell* shell, const std::string& url, uint32_t id) override;
   bool AcceptConnection(ApplicationConnection* connection) override;
   bool ShellConnectionLost() override;
   void Quit() override;
 
   // InterfaceFactory<NetworkService> implementation.
   void Create(ApplicationConnection* connection,
               InterfaceRequest<NetworkService> request) override;
 
   // InterfaceFactory<CookieStore> implementation.
   void Create(ApplicationConnection* connection,
               InterfaceRequest<CookieStore> request) override;
 
   // InterfaceFactory<WebSocketFactory> implementation.
   void Create(ApplicationConnection* connection,
               InterfaceRequest<WebSocketFactory> request) override;
 
   // InterfaceFactory<URLLoaderFactory> implementation.
   void Create(ApplicationConnection* connection,
               InterfaceRequest<URLLoaderFactory> request) override;
 
   // Overridden from FileSystemClient:
   void OnFileSystemShutdown() override;
 
  private:
-  ApplicationImpl* app_;
+  Shell* shell_;
   mojo::TracingImpl tracing_;
 
   // Observers that want notifications that our worker thread is going away.
   base::ObserverList<NetworkServiceDelegateObserver> observers_;
 
   Binding<filesystem::FileSystemClient> binding_;
 
   // A worker thread that blocks for file IO.
   scoped_ptr<base::Thread> io_worker_thread_;
 
   // Our connection to the filesystem service, which stores our cookies and
   // other data.
   filesystem::FileSystemPtr files_;
 
   scoped_ptr<NetworkContext> context_;
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_NETWORK_NETWORK_SERVICE_DELEGATE_H_