Rename ApplicationDelegate to ShellClient

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"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "mojo/message_pump/message_pump_mojo.h"
 #include "mojo/services/network/cookie_store_impl.h"
 #include "mojo/services/network/network_service_delegate_observer.h"
 #include "mojo/services/network/network_service_impl.h"
 #include "mojo/services/network/url_loader_factory_impl.h"
 #include "mojo/services/network/web_socket_factory_impl.h"
-#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/connection.h"
 #include "mojo/util/capture_util.h"
 #include "sql/mojo/mojo_vfs.h"
 
 namespace {
 
 const char kSQLThreadName[] = "SQL_IO_Thread";
 const char kUserDataDir[] = "user-data-dir";
 
 // SQL blocks on the filesystem service, so perform all SQL functions on a
 // separate thread.
@@ skipping 90 matching lines @@
   }
 
   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(shell_, url);
 }
 
-bool NetworkServiceDelegate::AcceptConnection(
-    ApplicationConnection* connection) {
+bool NetworkServiceDelegate::AcceptConnection(Connection* 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,
+void NetworkServiceDelegate::Create(Connection* connection,
                                     InterfaceRequest<NetworkService> request) {
   new NetworkServiceImpl(shell_->CreateAppRefCount(), std::move(request));
 }
 
-void NetworkServiceDelegate::Create(ApplicationConnection* connection,
+void NetworkServiceDelegate::Create(Connection* connection,
                                     InterfaceRequest<CookieStore> request) {
   new CookieStoreImpl(
       context_.get(), GURL(connection->GetRemoteApplicationURL()).GetOrigin(),
       shell_->CreateAppRefCount(), std::move(request));
 }
 
 void NetworkServiceDelegate::Create(
-    ApplicationConnection* connection,
+    Connection* connection,
     InterfaceRequest<WebSocketFactory> request) {
   new WebSocketFactoryImpl(context_.get(), shell_->CreateAppRefCount(),
                            std::move(request));
 }
 
 void NetworkServiceDelegate::Create(
-    ApplicationConnection* connection,
+    Connection* connection,
     InterfaceRequest<URLLoaderFactory> request) {
   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