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

mojo/services/network/network_service_delegate.cc

 // 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.
 
 #include "mojo/services/network/network_service_delegate.h"
 
 #include <utility>
 
 #include "base/at_exit.h"
 #include "base/base_paths.h"
@@ skipping 51 matching lines @@
   mojo::InterfacePtrInfo<filesystem::Directory> directory_info_;
 
   DISALLOW_COPY_AND_ASSIGN(SQLThread);
 };
 
 }  // namespace
 
 namespace mojo {
 
 NetworkServiceDelegate::NetworkServiceDelegate()
-    : app_(nullptr),
+    : shell_(nullptr),
       binding_(this) {
 }
 
 NetworkServiceDelegate::~NetworkServiceDelegate() {
 }
 
 void NetworkServiceDelegate::AddObserver(
     NetworkServiceDelegateObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void NetworkServiceDelegate::RemoveObserver(
     NetworkServiceDelegateObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
-void NetworkServiceDelegate::Initialize(ApplicationImpl* app) {
-  app_ = app;
+void NetworkServiceDelegate::Initialize(Shell* shell, const std::string& url,
+                                        uint32_t id) {
+  shell_ = shell;
 
 #if !defined(OS_ANDROID)
   // TODO(erg): The following doesn't work when running the android
   // apptests. It works in the mandoline shell (on desktop and on android), and
   // in the apptests on desktop. However, on android, whenever we make the call
   // to OpenFileSystem, the entire mojo system hangs to the point where writes
   // to stderr that previously would have printed to our console aren't. The
   // apptests are also fairly resistant to being run under gdb on android.
-  app_->ConnectToService("mojo:filesystem", &files_);
+  shell_->ConnectToService("mojo:filesystem", &files_);
 
   filesystem::FileError error = filesystem::FileError::FAILED;
   filesystem::DirectoryPtr directory;
   files_->OpenFileSystem("origin", GetProxy(&directory),
                          binding_.CreateInterfacePtrAndBind(), Capture(&error));
   files_.WaitForIncomingResponse();
 
   io_worker_thread_.reset(new SQLThread(std::move(directory)));
 #endif
 
@@ skipping 10 matching lines @@
   } else {
     CHECK(PathService::Get(base::DIR_TEMP, &base_path));
     base_path = base_path.Append(FILE_PATH_LITERAL("network_service"));
   }
 
   scoped_refptr<base::SequencedTaskRunner> worker_thread;
 #if !defined(OS_ANDROID)
   worker_thread = io_worker_thread_->task_runner();
 #endif
   context_.reset(new NetworkContext(base_path, worker_thread, this));
-  tracing_.Initialize(app);
+  tracing_.Initialize(shell_, url);
 }
 
 bool NetworkServiceDelegate::AcceptConnection(
     ApplicationConnection* connection) {
   DCHECK(context_);
   connection->AddService<CookieStore>(this);
   connection->AddService<NetworkService>(this);
   connection->AddService<URLLoaderFactory>(this);
   connection->AddService<WebSocketFactory>(this);
   return true;
 }
 
 bool NetworkServiceDelegate::ShellConnectionLost() {
   EnsureIOThreadShutdown();
   return true;
 }
 
 void NetworkServiceDelegate::Quit() {
   EnsureIOThreadShutdown();
 
   // Destroy the NetworkContext now as it requires MessageLoop::current() upon
   // destruction and it is the last moment we know for sure that it is
   // running.
   context_.reset();
 }
 
 void NetworkServiceDelegate::Create(ApplicationConnection* connection,
                                     InterfaceRequest<NetworkService> request) {
-  new NetworkServiceImpl(app_->app_lifetime_helper()->CreateAppRefCount(),
-                         std::move(request));
+  new NetworkServiceImpl(shell_->CreateAppRefCount(), std::move(request));
 }
 
 void NetworkServiceDelegate::Create(ApplicationConnection* connection,
                                     InterfaceRequest<CookieStore> request) {
   new CookieStoreImpl(
       context_.get(), GURL(connection->GetRemoteApplicationURL()).GetOrigin(),
-      app_->app_lifetime_helper()->CreateAppRefCount(), std::move(request));
+      shell_->CreateAppRefCount(), std::move(request));
 }
 
 void NetworkServiceDelegate::Create(
     ApplicationConnection* connection,
     InterfaceRequest<WebSocketFactory> request) {
-  new WebSocketFactoryImpl(context_.get(),
-                           app_->app_lifetime_helper()->CreateAppRefCount(),
+  new WebSocketFactoryImpl(context_.get(), shell_->CreateAppRefCount(),
                            std::move(request));
 }
 
 void NetworkServiceDelegate::Create(
     ApplicationConnection* connection,
     InterfaceRequest<URLLoaderFactory> request) {
-  new URLLoaderFactoryImpl(context_.get(),
-                           app_->app_lifetime_helper()->CreateAppRefCount(),
+  new URLLoaderFactoryImpl(context_.get(), shell_->CreateAppRefCount(),
                            std::move(request));
 }
 
 void NetworkServiceDelegate::OnFileSystemShutdown() {
   EnsureIOThreadShutdown();
 }
 
 void NetworkServiceDelegate::EnsureIOThreadShutdown() {
   if (io_worker_thread_) {
     // Broadcast to the entire system that we have to shut down anything
     // depending on the worker thread. Either we're shutting down or the
     // filesystem service is shutting down.
     FOR_EACH_OBSERVER(NetworkServiceDelegateObserver, observers_,
                       OnIOWorkerThreadShutdown());
 
     // Destroy the io worker thread here so that we can commit any pending
     // cookies here.
     io_worker_thread_.reset();
   }
 }
 
 }  // namespace mojo