Rename service/service_factory of file_system_provider and launcher_search_provider

chrome/chrome_tests_unit.gypi

Index: chrome/chrome_tests_unit.gypi
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index af2171610f491c227aa28a697aca086485480a1d..bee0c036787a41cd42fce455387e45369c714262 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -1193,6 +1193,7 @@
       'browser/chromeos/file_manager/volume_manager_unittest.cc',
       'browser/chromeos/file_system_provider/fake_provided_file_system.cc',
       'browser/chromeos/file_system_provider/fake_provided_file_system.h',
+      'browser/chromeos/file_system_provider/file_system_provider_service_unittest.cc',
       'browser/chromeos/file_system_provider/fileapi/buffering_file_stream_reader_unittest.cc',
       'browser/chromeos/file_system_provider/fileapi/buffering_file_stream_writer_unittest.cc',
       'browser/chromeos/file_system_provider/fileapi/file_stream_reader_unittest.cc',
@@ -1222,7 +1223,6 @@
       'browser/chromeos/file_system_provider/queue_unittest.cc',
       'browser/chromeos/file_system_provider/registry_unittest.cc',
       'browser/chromeos/file_system_provider/request_manager_unittest.cc',
-      'browser/chromeos/file_system_provider/service_unittest.cc',
       'browser/chromeos/file_system_provider/throttled_file_system_unittest.cc',
       'browser/chromeos/fileapi/external_file_url_request_job_unittest.cc',
       'browser/chromeos/fileapi/external_file_url_util_unittest.cc',
@@ -1429,8 +1429,8 @@
     'chrome_unit_tests_media_router_sources': [
       'browser/media/router/issue_manager_unittest.cc',
       'browser/media/router/issue_unittest.cc',
-      'browser/media/router/media_router_type_converters_unittest.cc',
       'browser/media/router/media_route_unittest.cc',
+      'browser/media/router/media_router_type_converters_unittest.cc',
       'browser/media/router/media_sink_unittest.cc',
       'browser/media/router/media_source_helper_unittest.cc',
       'browser/media/router/media_source_unittest.cc',
@@ -2553,13 +2553,13 @@
           ],
           'sources': [
             '<@(chrome_unit_tests_win_sources)',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/installer/util/installer_util_strings.rc',
             # TODO:  It would be nice to have these pulled in
             # automatically from direct_dependent_settings in
             # their various targets (net.gyp:net_resources, etc.),
             # but that causes errors in other targets when
             # resulting .res files get referenced multiple times.
             '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/installer/util/installer_util_strings.rc',
             '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc',
           ],
           'link_settings': {