1 files changed, 2 insertions, 66 deletions
diff --git a/components/filesystem/file_system_app.cc b/components/filesystem/file_system_app.cc
index 344a7ca..d5d577a 100644
--- a/components/filesystem/file_system_app.cc
+++ b/components/filesystem/file_system_app.cc
@@ -4,17 +4,13 @@
 
 #include "components/filesystem/file_system_app.h"
 
-#include <utility>
-
-#include "base/bind.h"
-#include "base/logging.h"
 #include "mojo/shell/public/cpp/connection.h"
 #include "mojo/shell/public/cpp/shell.h"
 
 namespace filesystem {
 
 FileSystemApp::FileSystemApp()
-    : shell_(nullptr), lock_table_(new LockTable), in_shutdown_(false) {}
+    : shell_(nullptr), lock_table_(new LockTable) {}
 
 FileSystemApp::~FileSystemApp() {}
 
@@ -29,70 +25,10 @@ bool FileSystemApp::AcceptConnection(mojo::Connection* connection) {
   return true;
 }
 
-void FileSystemApp::RegisterDirectoryToClient(DirectoryImpl* directory,
-                                              FileSystemClientPtr client) {
-  directory->set_connection_error_handler(
-      base::Bind(&FileSystemApp::OnDirectoryConnectionError,
-                 base::Unretained(this),
-                 directory));
-  client_mapping_.emplace_back(directory, std::move(client));
-}
-
-bool FileSystemApp::ShellConnectionLost() {
-  if (client_mapping_.empty()) {
-    // If we have no current connections, we can shutdown immediately.
-    return true;
-  }
-
-  in_shutdown_ = true;
-
-  // We have live connections. Send a notification to each one indicating that
-  // 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::Connection* connection,
                            mojo::InterfaceRequest<FileSystem> request) {
-  new FileSystemImpl(this, connection, std::move(request), lock_table_.get());
-}
-
-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);
-
-      if (in_shutdown_ && client_mapping_.empty()) {
-        // We just cleared the last directory after our shell connection went
-        // away. Time to shut ourselves down.
-        shell_->Quit();
-      }
-
-      return;
-    }
-  }
-}
-
-FileSystemApp::Client::Client(DirectoryImpl* directory,
-                              FileSystemClientPtr fs_client)
-    : directory_(directory), fs_client_(std::move(fs_client)) {}
-
-FileSystemApp::Client::Client(Client&& rhs)
-    : directory_(rhs.directory_), fs_client_(std::move(rhs.fs_client_)) {}
-
-FileSystemApp::Client::~Client() {}
-
-FileSystemApp::Client& FileSystemApp::Client::operator=(
-    FileSystemApp::Client&& rhs) {
-  directory_ = rhs.directory_;
-  fs_client_ = std::move(rhs.fs_client_);
-  return *this;
+  new FileSystemImpl(connection, std::move(request), lock_table_.get());
 }
 
 }  // namespace filesystem