Rename ApplicationDelegate to ShellClient

components/filesystem/file_system_app.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 "components/filesystem/file_system_app.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/logging.h"
-#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/connection.h"
 #include "mojo/shell/public/cpp/shell.h"
 
 namespace filesystem {
 
 FileSystemApp::FileSystemApp() : shell_(nullptr), in_shutdown_(false) {}
 
 FileSystemApp::~FileSystemApp() {}
 
 void FileSystemApp::Initialize(mojo::Shell* shell, const std::string& url,
                                uint32_t id) {
   shell_ = shell;
   tracing_.Initialize(shell, url);
 }
 
-bool FileSystemApp::AcceptConnection(
-    mojo::ApplicationConnection* connection) {
+bool FileSystemApp::AcceptConnection(mojo::Connection* connection) {
   connection->AddService<FileSystem>(this);
   return true;
 }
 
 void FileSystemApp::RegisterDirectoryToClient(DirectoryImpl* directory,
                                               FileSystemClientPtr client) {
   directory->set_connection_error_handler(
       base::Bind(&FileSystemApp::OnDirectoryConnectionError,
                  base::Unretained(this),
                  directory));
@@ skipping 12 matching lines @@
   // they should shutdown.
   for (std::vector<Client>::iterator it = client_mapping_.begin();
        it != client_mapping_.end(); ++it) {
     it->fs_client_->OnFileSystemShutdown();
   }
 
   return false;
 }
 
 // |InterfaceFactory<Files>| implementation:
-void FileSystemApp::Create(mojo::ApplicationConnection* connection,
+void FileSystemApp::Create(mojo::Connection* connection,
                            mojo::InterfaceRequest<FileSystem> request) {
   new FileSystemImpl(this, connection, std::move(request));
 }
 
 void FileSystemApp::OnDirectoryConnectionError(DirectoryImpl* directory) {
   for (std::vector<Client>::iterator it = client_mapping_.begin();
        it != client_mapping_.end(); ++it) {
     if (it->directory_ == directory) {
       client_mapping_.erase(it);
 
@@ skipping 18 matching lines @@
 FileSystemApp::Client::~Client() {}
 
 FileSystemApp::Client& FileSystemApp::Client::operator=(
     FileSystemApp::Client&& rhs) {
   directory_ = rhs.directory_;
   fs_client_ = std::move(rhs.fs_client_);
   return *this;
 }
 
 }  // namespace filesystem