Rename shell namespace to service_manager

services/file/file_service.cc

Index: services/file/file_service.cc
diff --git a/services/file/file_service.cc b/services/file/file_service.cc
index 3bc08183b2fc417cf56f823a010e03bf2b4adf8b..85a53b128a9c789e41791295542f6a1ed7612dc9 100644
--- a/services/file/file_service.cc
+++ b/services/file/file_service.cc
@@ -25,7 +25,7 @@ class FileService::FileSystemObjects
   ~FileSystemObjects() {}
 
   // Called on the |file_service_runner_|.
-  void OnFileSystemRequest(const shell::Identity& remote_identity,
+  void OnFileSystemRequest(const service_manager::Identity& remote_identity,
                            mojom::FileSystemRequest request) {
     if (!lock_table_)
       lock_table_ = new filesystem::LockTable;
@@ -52,7 +52,7 @@ class FileService::LevelDBServiceObjects
   ~LevelDBServiceObjects() {}
 
   // Called on the |leveldb_service_runner_|.
-  void OnLevelDBServiceRequest(const shell::Identity& remote_identity,
+  void OnLevelDBServiceRequest(const service_manager::Identity& remote_identity,
                                leveldb::mojom::LevelDBServiceRequest request) {
     if (!leveldb_service_)
       leveldb_service_.reset(new leveldb::LevelDBServiceImpl(task_runner_));
@@ -69,7 +69,7 @@ class FileService::LevelDBServiceObjects
   DISALLOW_COPY_AND_ASSIGN(LevelDBServiceObjects);
 };
 
-std::unique_ptr<shell::Service> CreateFileService(
+std::unique_ptr<service_manager::Service> CreateFileService(
     scoped_refptr<base::SingleThreadTaskRunner> file_service_runner,
     scoped_refptr<base::SingleThreadTaskRunner> leveldb_service_runner,
     const base::Closure& quit_closure) {
@@ -88,22 +88,22 @@ FileService::~FileService() {
   leveldb_service_runner_->DeleteSoon(FROM_HERE, leveldb_objects_.release());
 }
 
-void FileService::OnStart(const shell::Identity& identity) {
+void FileService::OnStart(const service_manager::Identity& identity) {
   file_system_objects_.reset(new FileService::FileSystemObjects(
       GetUserDirForUserId(identity.user_id())));
   leveldb_objects_.reset(
       new FileService::LevelDBServiceObjects(leveldb_service_runner_));
 }
 
-bool FileService::OnConnect(const shell::Identity& remote_identity,
-                                shell::InterfaceRegistry* registry) {
+bool FileService::OnConnect(const service_manager::Identity& remote_identity,
+                            service_manager::InterfaceRegistry* registry) {
   registry->AddInterface<leveldb::mojom::LevelDBService>(this);
   registry->AddInterface<mojom::FileSystem>(this);
   return true;
 }
 
-void FileService::Create(const shell::Identity& remote_identity,
-                             mojom::FileSystemRequest request) {
+void FileService::Create(const service_manager::Identity& remote_identity,
+                         mojom::FileSystemRequest request) {
   file_service_runner_->PostTask(
       FROM_HERE,
       base::Bind(&FileService::FileSystemObjects::OnFileSystemRequest,
@@ -111,8 +111,8 @@ void FileService::Create(const shell::Identity& remote_identity,
                  base::Passed(&request)));
 }
 
-void FileService::Create(const shell::Identity& remote_identity,
-                             leveldb::mojom::LevelDBServiceRequest request) {
+void FileService::Create(const service_manager::Identity& remote_identity,
+                         leveldb::mojom::LevelDBServiceRequest request) {
   leveldb_service_runner_->PostTask(
       FROM_HERE,
       base::Bind(