Rename service/service_factory of file_system_provider and launcher_search_provider

chrome/browser/chromeos/file_system_provider/file_system_provider_service.cc

Index: chrome/browser/chromeos/file_system_provider/file_system_provider_service.cc
diff --git a/chrome/browser/chromeos/file_system_provider/service.cc b/chrome/browser/chromeos/file_system_provider/file_system_provider_service.cc
similarity index 96%
rename from chrome/browser/chromeos/file_system_provider/service.cc
rename to chrome/browser/chromeos/file_system_provider/file_system_provider_service.cc
index faa6ce5c885e84dfd936f31b30180fbcfade88a8..0917c257dab2c2576898611d2696e4e15f2f5f7c 100644
--- a/chrome/browser/chromeos/file_system_provider/service.cc
+++ b/chrome/browser/chromeos/file_system_provider/file_system_provider_service.cc
@@ -2,20 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/file_system_provider/service.h"
+#include "chrome/browser/chromeos/file_system_provider/file_system_provider_service.h"
 
 #include "base/files/file_path.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/stl_util.h"
 #include "base/values.h"
+#include "chrome/browser/chromeos/file_system_provider/file_system_provider_service_factory.h"
 #include "chrome/browser/chromeos/file_system_provider/mount_path_util.h"
 #include "chrome/browser/chromeos/file_system_provider/observer.h"
 #include "chrome/browser/chromeos/file_system_provider/provided_file_system.h"
 #include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h"
 #include "chrome/browser/chromeos/file_system_provider/registry.h"
 #include "chrome/browser/chromeos/file_system_provider/registry_interface.h"
-#include "chrome/browser/chromeos/file_system_provider/service_factory.h"
 #include "chrome/browser/chromeos/file_system_provider/throttled_file_system.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_registry.h"
@@ -204,8 +204,7 @@ base::File::Error Service::UnmountFileSystem(const std::string& extension_id,
   if (file_system_it == file_system_map_.end()) {
     const ProvidedFileSystemInfo empty_file_system_info;
     FOR_EACH_OBSERVER(
-        Observer,
-        observers_,
+        Observer, observers_,
         OnProvidedFileSystemUnmount(empty_file_system_info,
                                     base::File::FILE_ERROR_NOT_FOUND));
     return base::File::FILE_ERROR_NOT_FOUND;
@@ -222,16 +221,14 @@ base::File::Error Service::UnmountFileSystem(const std::string& extension_id,
       file_system_info.mount_path().BaseName().value();
   if (!mount_points->RevokeFileSystem(mount_point_name)) {
     FOR_EACH_OBSERVER(
-        Observer,
-        observers_,
+        Observer, observers_,
         OnProvidedFileSystemUnmount(file_system_info,
                                     base::File::FILE_ERROR_INVALID_OPERATION));
     return base::File::FILE_ERROR_INVALID_OPERATION;
   }
 
   FOR_EACH_OBSERVER(
-      Observer,
-      observers_,
+      Observer, observers_,
       OnProvidedFileSystemUnmount(file_system_info, base::File::FILE_OK));
 
   mount_point_name_to_key_map_.erase(mount_point_name);
@@ -256,10 +253,9 @@ bool Service::RequestUnmount(const std::string& extension_id,
   if (file_system_it == file_system_map_.end())
     return false;
 
-  file_system_it->second->RequestUnmount(
-      base::Bind(&Service::OnRequestUnmountStatus,
-                 weak_ptr_factory_.GetWeakPtr(),
-                 file_system_it->second->GetFileSystemInfo()));
+  file_system_it->second->RequestUnmount(base::Bind(
+      &Service::OnRequestUnmountStatus, weak_ptr_factory_.GetWeakPtr(),
+      file_system_it->second->GetFileSystemInfo()));
   return true;
 }
 
@@ -290,8 +286,7 @@ std::vector<ProvidedFileSystemInfo> Service::GetProvidedFileSystemInfoList() {
 
   std::vector<ProvidedFileSystemInfo> result;
   for (ProvidedFileSystemMap::const_iterator it = file_system_map_.begin();
-       it != file_system_map_.end();
-       ++it) {
+       it != file_system_map_.end(); ++it) {
     result.push_back(it->second->GetFileSystemInfo());
   }
   return result;
@@ -428,8 +423,7 @@ void Service::OnRequestUnmountStatus(
   // called by the provided file system. In case of success mount() will be
   // invoked, and observers notified, so there is no need to call them now.
   if (error != base::File::FILE_OK) {
-    FOR_EACH_OBSERVER(Observer,
-                      observers_,
+    FOR_EACH_OBSERVER(Observer, observers_,
                       OnProvidedFileSystemUnmount(file_system_info, error));
   }
 }