5 files changed, 14 insertions, 16 deletions
diff --git a/components/filesystem/file_system_app.cc b/components/filesystem/file_system_app.cc
index 0de2211..8bb5354 100644
--- a/components/filesystem/file_system_app.cc
+++ b/components/filesystem/file_system_app.cc
@@ -8,7 +8,7 @@
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "mojo/shell/public/cpp/connection.h"
-#include "mojo/shell/public/cpp/shell.h"
+#include "mojo/shell/public/cpp/connector.h"
 
 #if defined(OS_WIN)
 #include "base/base_paths_win.h"
@@ -33,15 +33,14 @@ const char kUserDataDir[] = "user-data-dir";
 
 }  // namespace filesystem
 
-FileSystemApp::FileSystemApp()
-    : shell_(nullptr), lock_table_(new LockTable) {}
+FileSystemApp::FileSystemApp() : lock_table_(new LockTable) {}
 
 FileSystemApp::~FileSystemApp() {}
 
-void FileSystemApp::Initialize(mojo::Shell* shell, const std::string& url,
+void FileSystemApp::Initialize(mojo::Connector* connector,
+                               const std::string& url,
                                uint32_t id, uint32_t user_id) {
-  shell_ = shell;
-  tracing_.Initialize(shell, url);
+  tracing_.Initialize(connector, url);
 }
 
 bool FileSystemApp::AcceptConnection(mojo::Connection* connection) {
diff --git a/components/filesystem/file_system_app.h b/components/filesystem/file_system_app.h
index 3279415..f71eae9 100644
--- a/components/filesystem/file_system_app.h
+++ b/components/filesystem/file_system_app.h
@@ -15,7 +15,7 @@
 #include "mojo/shell/public/cpp/shell_client.h"
 
 namespace mojo {
-class Shell;
+class Connector;
 }
 
 namespace filesystem {
@@ -31,7 +31,7 @@ class FileSystemApp : public mojo::ShellClient,
   static base::FilePath GetUserDataDir();
 
   // |mojo::ShellClient| override:
-  void Initialize(mojo::Shell* shell, const std::string& url,
+  void Initialize(mojo::Connector* connector, const std::string& url,
                   uint32_t id, uint32_t user_id) override;
   bool AcceptConnection(mojo::Connection* connection) override;
 
@@ -39,7 +39,6 @@ class FileSystemApp : public mojo::ShellClient,
   void Create(mojo::Connection* connection,
               mojo::InterfaceRequest<FileSystem> request) override;
 
-  mojo::Shell* shell_;
   mojo::TracingImpl tracing_;
 
   scoped_ptr<LockTable> lock_table_;
diff --git a/components/filesystem/files_test_base.cc b/components/filesystem/files_test_base.cc
index d47be02..15399c3 100644
--- a/components/filesystem/files_test_base.cc
+++ b/components/filesystem/files_test_base.cc
@@ -8,7 +8,7 @@
 
 #include "components/filesystem/public/interfaces/directory.mojom.h"
 #include "components/filesystem/public/interfaces/types.mojom.h"
-#include "mojo/shell/public/cpp/shell.h"
+#include "mojo/shell/public/cpp/connector.h"
 #include "mojo/util/capture_util.h"
 
 namespace filesystem {
@@ -21,7 +21,7 @@ FilesTestBase::~FilesTestBase() {
 
 void FilesTestBase::SetUp() {
   ApplicationTestBase::SetUp();
-  shell()->ConnectToInterface("mojo:filesystem", &files_);
+  connector()->ConnectToInterface("mojo:filesystem", &files_);
 }
 
 void FilesTestBase::GetTemporaryRoot(DirectoryPtr* directory) {
diff --git a/components/filesystem/public/cpp/prefs/pref_service_factory.cc b/components/filesystem/public/cpp/prefs/pref_service_factory.cc
index 5c75bb6..add4532 100644
--- a/components/filesystem/public/cpp/prefs/pref_service_factory.cc
+++ b/components/filesystem/public/cpp/prefs/pref_service_factory.cc
@@ -12,7 +12,7 @@
 #include "components/prefs/pref_value_store.h"
 #include "components/prefs/value_map_pref_store.h"
 #include "components/prefs/writeable_pref_store.h"
-#include "mojo/shell/public/cpp/shell.h"
+#include "mojo/shell/public/cpp/connector.h"
 
 namespace filesystem {
 
@@ -23,10 +23,10 @@ void DoNothingHandleReadError(PersistentPrefStore::PrefReadError error) {}
 
 }  // namespace
 
-scoped_ptr<PrefService> CreatePrefService(mojo::Shell* shell,
+scoped_ptr<PrefService> CreatePrefService(mojo::Connector* connector,
                                           PrefRegistry* pref_registry) {
   filesystem::FileSystemPtr filesystem;
-  shell->ConnectToInterface("mojo:filesystem", &filesystem);
+  connector->ConnectToInterface("mojo:filesystem", &filesystem);
 
   scoped_refptr<FilesystemJsonPrefStore> user_prefs =
       new FilesystemJsonPrefStore("preferences.json", std::move(filesystem),
diff --git a/components/filesystem/public/cpp/prefs/pref_service_factory.h b/components/filesystem/public/cpp/prefs/pref_service_factory.h
index bff3908..23ee9ff 100644
--- a/components/filesystem/public/cpp/prefs/pref_service_factory.h
+++ b/components/filesystem/public/cpp/prefs/pref_service_factory.h
@@ -9,7 +9,7 @@
 #include "components/prefs/pref_service.h"
 
 namespace mojo {
-class Shell;
+class Connector;
 }
 
 class PrefRegistry;
@@ -19,7 +19,7 @@ namespace filesystem {
 // This factory method creates a PrefService for the local process based on the
 // preference registry passed in. This PrefService will synchronize with a JSON
 // file in the mojo:filesystem.
-scoped_ptr<PrefService> CreatePrefService(mojo::Shell* shell,
+scoped_ptr<PrefService> CreatePrefService(mojo::Connector* connector,
                                           PrefRegistry* registry);
 
 }  // namespace filesystem