Rename service subdir under chrome/browser to service_process

It is renamed because we're going to add new "services" directory which holds all google services related codes, like sync, invalidation and signin. We do not want to have both "service" and "services" to cause the confusion. Since all codes under "service" deal purely with service process, we would like to rename it to "service_process".

BUG=none
TEST=none due to that this is just a dir renaming
R=thakis@chromium.org, vitalybuka@chromium.org

Review URL: https://codereview.chromium.org/57383010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233023 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/app_controller_mac.mm

@@ -35,7 +35,7 @@
 #include "chrome/browser/profiles/profile_info_cache_observer.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profiles_state.h"
-#include "chrome/browser/service/service_process_control.h"
+#include "chrome/browser/service_process/service_process_control.h"
 #include "chrome/browser/sessions/session_restore.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_service_factory.h"

chrome/browser/browser_shutdown.cc

@@ -28,7 +28,7 @@
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/service/service_process_control.h"
+#include "chrome/browser/service_process/service_process_control.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"

chrome/browser/chrome_browser_main.cc

@@ -90,7 +90,6 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profiles_state.h"
-#include "chrome/browser/service/service_process_control.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/three_d_api_observer.h"
 #include "chrome/browser/translate/translate_manager.h"

chrome/browser/metrics/metrics_service.cc

@@ -229,7 +229,7 @@
 #endif
 
 #if !defined(OS_ANDROID)
-#include "chrome/browser/service/service_process_control.h"
+#include "chrome/browser/service_process/service_process_control.h"
 #endif
 
 using base::Time;

chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc

@@ -23,7 +23,7 @@
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/service/service_process_control.h"
+#include "chrome/browser/service_process/service_process_control.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/cloud_print/cloud_print_proxy_info.h"
 #include "chrome/common/pref_names.h"

chrome/browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc

@@ -11,7 +11,7 @@
 #include "base/run_loop.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"
-#include "chrome/browser/service/service_process_control.h"
+#include "chrome/browser/service_process/service_process_control.h"
 #include "chrome/browser/ui/startup/startup_browser_creator.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/cloud_print/cloud_print_proxy_info.h"

chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc

@@ -19,7 +19,7 @@
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"
-#include "chrome/browser/service/service_process_control.h"
+#include "chrome/browser/service_process/service_process_control.h"
 #include "chrome/browser/ui/startup/startup_browser_creator.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"

chrome/browser/service/service_process_control.cc → chrome/browser/service_process/service_process_control.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/service/service_process_control.h"
+#include "chrome/browser/service_process/service_process_control.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"

chrome/browser/service/service_process_control.h → chrome/browser/service_process/service_process_control.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SERVICE_SERVICE_PROCESS_CONTROL_H_
-#define CHROME_BROWSER_SERVICE_SERVICE_PROCESS_CONTROL_H_
+#ifndef CHROME_BROWSER_SERVICE_PROCESS_SERVICE_PROCESS_CONTROL_H_
+#define CHROME_BROWSER_SERVICE_PROCESS_SERVICE_PROCESS_CONTROL_H_
 
 #include <queue>
 #include <set>
@@ -216,4 +216,4 @@ class ServiceProcessControl : public IPC::Sender,
   base::CancelableClosure histograms_timeout_callback_;
 };
 
-#endif  // CHROME_BROWSER_SERVICE_SERVICE_PROCESS_CONTROL_H_
+#endif  // CHROME_BROWSER_SERVICE_PROCESS_SERVICE_PROCESS_CONTROL_H_

chrome/browser/service/service_process_control_browsertest.cc → chrome/browser/service_process/service_process_control_browsertest.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/service/service_process_control.h"
+#include "chrome/browser/service_process/service_process_control.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"

chrome/browser/service/service_process_control_mac.mm → chrome/browser/service_process/service_process_control_mac.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/service/service_process_control.h"
+#include "chrome/browser/service_process/service_process_control.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"

chrome/browser/ui/webui/options/browser_options_handler.cc

@@ -47,7 +47,6 @@
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
-#include "chrome/browser/service/service_process_control.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"

chrome/chrome_browser.gypi

@@ -1980,9 +1980,9 @@
         'browser/search_engines/template_url_service_observer.h',
         'browser/search_engines/util.cc',
         'browser/search_engines/util.h',
-        'browser/service/service_process_control.cc',
-        'browser/service/service_process_control_mac.mm',
-        'browser/service/service_process_control.h',
+        'browser/service_process/service_process_control.cc',
+        'browser/service_process/service_process_control_mac.mm',
+        'browser/service_process/service_process_control.h',
         'browser/sessions/base_session_service.cc',
         'browser/sessions/base_session_service.h',
         'browser/sessions/persistent_tab_restore_service.cc',

chrome/chrome_tests.gypi

@@ -1374,7 +1374,7 @@
         'browser/safe_browsing/safe_browsing_blocking_page_test.cc',
         'browser/safe_browsing/safe_browsing_service_browsertest.cc',
         'browser/safe_browsing/safe_browsing_test.cc',
-        'browser/service/service_process_control_browsertest.cc',
+        'browser/service_process/service_process_control_browsertest.cc',
         'browser/sessions/better_session_restore_browsertest.cc',
         'browser/sessions/persistent_tab_restore_service_browsertest.cc',
         'browser/sessions/session_restore_browsertest.cc',
@@ -1761,7 +1761,7 @@
             '../apps/load_and_launch_browsertest.cc',
             'browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc',
             'browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc',
-            'browser/service/service_process_control_browsertest.cc',
+            'browser/service_process/service_process_control_browsertest.cc',
             'browser/signin/signin_browsertest.cc',
             'browser/ui/app_list/test/app_list_service_test_api_linux.cc',
             # chromeos does not use cross-platform panels