Eliminate mojo::Shell client lib class

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 13 matching lines @@
 #include "mojo/util/capture_util.h"
 
 namespace {
 
 const char kUserDataDir[] = "user-data-dir";
 
 }  // namespace
 
 namespace mojo {
 
-NetworkServiceDelegate::NetworkServiceDelegate()
-    : shell_(nullptr) {
+NetworkServiceDelegate::NetworkServiceDelegate() {
+  ref_factory_.set_quit_closure(
+      base::Bind(&NetworkServiceDelegate::Quit, base::Unretained(this)));
 }
-
-NetworkServiceDelegate::~NetworkServiceDelegate() {
-}
+NetworkServiceDelegate::~NetworkServiceDelegate() {}
 
 void NetworkServiceDelegate::AddObserver(
     NetworkServiceDelegateObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void NetworkServiceDelegate::RemoveObserver(
     NetworkServiceDelegateObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
-void NetworkServiceDelegate::Initialize(Shell* shell, const std::string& url,
+void NetworkServiceDelegate::Initialize(Connector* connector,
+                                        const std::string& url,
                                         uint32_t id, uint32_t user_id) {
-  shell_ = shell;
-
   // TODO(erg): Find everything else that writes to the filesystem and
   // transition it to proxying mojo:filesystem. We shouldn't have any path
   // calculation code here, but sadly need it until the transition is done. In
   // the mean time, manually handle the user-data-dir switch (which gets set in
   // tests) so that tests are writing to a temp dir.
   base::FilePath base_path;
   const base::CommandLine* command_line =
       base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(kUserDataDir)) {
     base_path = command_line->GetSwitchValuePath(kUserDataDir);
   } else {
     CHECK(PathService::Get(base::DIR_TEMP, &base_path));
     base_path = base_path.Append(FILE_PATH_LITERAL("network_service"));
   }
 
   context_.reset(new NetworkContext(base_path, this));
-  tracing_.Initialize(shell_, url);
+  tracing_.Initialize(connector, url);
 }
 
 bool NetworkServiceDelegate::AcceptConnection(Connection* connection) {
   DCHECK(context_);
   connection->AddInterface<CookieStore>(this);
   connection->AddInterface<NetworkService>(this);
   connection->AddInterface<URLLoaderFactory>(this);
   connection->AddInterface<WebSocketFactory>(this);
   return true;
 }
 
 bool NetworkServiceDelegate::ShellConnectionLost() {
   return true;
 }
 
+void NetworkServiceDelegate::Create(Connection* connection,
+                                    InterfaceRequest<NetworkService> request) {
+  new NetworkServiceImpl(ref_factory_.CreateRef(), std::move(request));
+}
+
+void NetworkServiceDelegate::Create(Connection* connection,
+                                    InterfaceRequest<CookieStore> request) {
+  new CookieStoreImpl(
+      context_.get(), GURL(connection->GetRemoteApplicationURL()).GetOrigin(),
+      ref_factory_.CreateRef(), std::move(request));
+}
+
+void NetworkServiceDelegate::Create(
+    Connection* connection,
+    InterfaceRequest<WebSocketFactory> request) {
+  new WebSocketFactoryImpl(context_.get(), ref_factory_.CreateRef(),
+                           std::move(request));
+}
+
+void NetworkServiceDelegate::Create(
+    Connection* connection,
+    InterfaceRequest<URLLoaderFactory> request) {
+  new URLLoaderFactoryImpl(context_.get(), ref_factory_.CreateRef(),
+                           std::move(request));
+}
+
 void NetworkServiceDelegate::Quit() {
   // 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(Connection* connection,
-                                    InterfaceRequest<NetworkService> request) {
-  new NetworkServiceImpl(shell_->CreateAppRefCount(), std::move(request));
-}
-
-void NetworkServiceDelegate::Create(Connection* connection,
-                                    InterfaceRequest<CookieStore> request) {
-  new CookieStoreImpl(
-      context_.get(), GURL(connection->GetRemoteApplicationURL()).GetOrigin(),
-      shell_->CreateAppRefCount(), std::move(request));
-}
-
-void NetworkServiceDelegate::Create(
-    Connection* connection,
-    InterfaceRequest<WebSocketFactory> request) {
-  new WebSocketFactoryImpl(context_.get(), shell_->CreateAppRefCount(),
-                           std::move(request));
-}
-
-void NetworkServiceDelegate::Create(
-    Connection* connection,
-    InterfaceRequest<URLLoaderFactory> request) {
-  new URLLoaderFactoryImpl(context_.get(), shell_->CreateAppRefCount(),
-                           std::move(request));
-}
-
 }  // namespace mojo