Rename files to match the ControlService -> UpdateServiceInternal.

This change is just renaming files, changing header guards, include
directives, and build files to match the new names.

Bug: 1151106

Change-Id: Ia52ff972d3cee0d6623cfd051be7cababafbdce8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2551852Reviewed-by: Joshua Pawlicki <waffles@chromium.org>
Commit-Queue: Sorin Jianu <sorin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#829881}

chrome/updater/BUILD.gn

@@ -39,7 +39,6 @@ if (is_win || is_mac) {
       "action_handler.h",
       "constants.cc",
       "constants.h",
-      "control_service.h",
       "crash_client.cc",
       "crash_client.h",
       "crash_reporter.cc",
@@ -59,6 +58,7 @@ if (is_win || is_mac) {
       "unzipper.h",
       "update_service.cc",
       "update_service.h",
+      "update_service_internal.h",
       "util.cc",
       "util.h",
     ]
@@ -95,10 +95,6 @@ if (is_win || is_mac) {
       "app/app_wake.h",
       "configurator.cc",
       "configurator.h",
-      "control_service_impl.cc",
-      "control_service_impl.h",
-      "control_service_impl_inactive.cc",
-      "control_service_impl_inactive.h",
       "crx_downloader_factory.h",
       "external_constants.cc",
       "external_constants.h",
@@ -118,6 +114,10 @@ if (is_win || is_mac) {
       "update_service_impl.h",
       "update_service_impl_inactive.cc",
       "update_service_impl_inactive.h",
+      "update_service_internal_impl.cc",
+      "update_service_internal_impl.h",
+      "update_service_internal_impl_inactive.cc",
+      "update_service_internal_impl_inactive.h",
       "updater.cc",
       "updater.h",
     ]
@@ -138,8 +138,8 @@ if (is_win || is_mac) {
         "launchd_util.cc",
         "launchd_util.h",
         "lib_util_mac.mm",
-        "mac/control_service_proxy.h",
-        "mac/control_service_proxy.mm",
+        "mac/update_service_internal_proxy.h",
+        "mac/update_service_internal_proxy.mm",
         "mac/update_service_proxy.h",
         "mac/update_service_proxy.mm",
         "prefs_mac.mm",

chrome/updater/app/app_install.cc

@@ -19,13 +19,13 @@
 #include "base/version.h"
 #include "build/build_config.h"
 #include "chrome/updater/constants.h"
-#include "chrome/updater/control_service.h"
 #include "chrome/updater/persisted_data.h"
 #include "chrome/updater/prefs.h"
 #include "chrome/updater/registration_data.h"
 #include "chrome/updater/setup.h"
 #include "chrome/updater/tag.h"
 #include "chrome/updater/update_service.h"
+#include "chrome/updater/update_service_internal.h"
 #include "chrome/updater/updater_version.h"
 #include "components/prefs/pref_service.h"
 

chrome/updater/app/app_server.cc

@@ -12,14 +12,14 @@
 #include "base/version.h"
 #include "chrome/updater/configurator.h"
 #include "chrome/updater/constants.h"
-#include "chrome/updater/control_service.h"
-#include "chrome/updater/control_service_impl.h"
-#include "chrome/updater/control_service_impl_inactive.h"
 #include "chrome/updater/persisted_data.h"
 #include "chrome/updater/prefs.h"
 #include "chrome/updater/update_service.h"
 #include "chrome/updater/update_service_impl.h"
 #include "chrome/updater/update_service_impl_inactive.h"
+#include "chrome/updater/update_service_internal.h"
+#include "chrome/updater/update_service_internal_impl.h"
+#include "chrome/updater/update_service_internal_impl_inactive.h"
 #include "chrome/updater/updater_version.h"
 #include "components/prefs/pref_service.h"
 

chrome/updater/app/app_server_unittest.cc

@@ -13,9 +13,9 @@
 #include "base/task/single_thread_task_executor.h"
 #include "base/task/thread_pool/thread_pool_instance.h"
 #include "chrome/updater/constants.h"
-#include "chrome/updater/control_service.h"
 #include "chrome/updater/prefs.h"
 #include "chrome/updater/update_service.h"
+#include "chrome/updater/update_service_internal.h"
 #include "chrome/updater/updater_version.h"
 #include "chrome/updater/util.h"
 #include "components/prefs/pref_service.h"

chrome/updater/app/app_wake.cc

@@ -7,7 +7,7 @@
 #include "base/bind.h"
 #include "build/build_config.h"
 #include "chrome/updater/app/app.h"
-#include "chrome/updater/control_service.h"
+#include "chrome/updater/update_service_internal.h"
 
 namespace updater {
 

chrome/updater/app/server/mac/server.mm

@@ -21,11 +21,11 @@
 #include "chrome/updater/app/server/mac/service_delegate.h"
 #include "chrome/updater/configurator.h"
 #include "chrome/updater/constants.h"
-#include "chrome/updater/control_service.h"
 #include "chrome/updater/mac/setup/setup.h"
 #import "chrome/updater/mac/xpc_service_names.h"
 #include "chrome/updater/prefs.h"
 #include "chrome/updater/update_service.h"
+#include "chrome/updater/update_service_internal.h"
 
 namespace updater {
 

chrome/updater/app/server/mac/service_delegate.mm

@@ -21,10 +21,10 @@
 #import "chrome/updater/app/server/mac/server.h"
 #import "chrome/updater/app/server/mac/service_protocol.h"
 #import "chrome/updater/app/server/mac/update_service_wrappers.h"
-#include "chrome/updater/control_service.h"
 #include "chrome/updater/mac/setup/setup.h"
 #import "chrome/updater/mac/xpc_service_names.h"
 #include "chrome/updater/update_service.h"
+#include "chrome/updater/update_service_internal.h"
 #include "chrome/updater/updater_version.h"
 
 @interface CRUUpdateCheckServiceXPCImpl : NSObject <CRUUpdateChecking>

chrome/updater/app/server/win/server.cc

@@ -20,9 +20,9 @@
 #include "chrome/updater/app/server/win/com_classes.h"
 #include "chrome/updater/app/server/win/com_classes_legacy.h"
 #include "chrome/updater/configurator.h"
-#include "chrome/updater/control_service.h"
 #include "chrome/updater/prefs.h"
 #include "chrome/updater/update_service.h"
+#include "chrome/updater/update_service_internal.h"
 #include "chrome/updater/win/constants.h"
 #include "chrome/updater/win/setup/uninstall.h"
 #include "chrome/updater/win/wrl_module.h"

chrome/updater/app/server/win/server.h

@@ -14,8 +14,8 @@
 #include "base/win/scoped_com_initializer.h"
 #include "chrome/updater/app/app.h"
 #include "chrome/updater/app/app_server.h"
-#include "chrome/updater/control_service.h"
 #include "chrome/updater/update_service.h"
+#include "chrome/updater/update_service_internal.h"
 
 namespace updater {
 

chrome/updater/mac/control_service_proxy.h → chrome/updater/mac/update_service_internal_proxy.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_UPDATER_MAC_CONTROL_SERVICE_PROXY_H_
-#define CHROME_UPDATER_MAC_CONTROL_SERVICE_PROXY_H_
+#ifndef CHROME_UPDATER_MAC_UPDATE_SERVICE_INTERNAL_PROXY_H_
+#define CHROME_UPDATER_MAC_UPDATE_SERVICE_INTERNAL_PROXY_H_
 
 #import <Foundation/Foundation.h>
 
@@ -11,8 +11,8 @@
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_refptr.h"
 #include "base/sequence_checker.h"
-#include "chrome/updater/control_service.h"
 #include "chrome/updater/service_scope.h"
+#include "chrome/updater/update_service_internal.h"
 
 @class CRUUpdateServiceInternalProxyImpl;
 
@@ -43,4 +43,4 @@ class UpdateServiceInternalProxy : public UpdateServiceInternal {
 
 }  // namespace updater
 
-#endif  // CHROME_UPDATER_MAC_CONTROL_SERVICE_PROXY_H_
+#endif  // CHROME_UPDATER_MAC_UPDATE_SERVICE_INTERNAL_PROXY_H_

chrome/updater/mac/control_service_proxy.mm → chrome/updater/mac/update_service_internal_proxy.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/updater/mac/control_service_proxy.h"
+#include "chrome/updater/mac/update_service_internal_proxy.h"
 
 #import <Foundation/Foundation.h>
 

chrome/updater/service_factory_mac.mm

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/memory/ref_counted.h"
-#include "chrome/updater/mac/control_service_proxy.h"
+#include "chrome/updater/mac/update_service_internal_proxy.h"
 #include "chrome/updater/mac/update_service_proxy.h"
 #include "chrome/updater/service_scope.h"
 

chrome/updater/service_factory_win.cc

@@ -6,7 +6,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/no_destructor.h"
 #include "chrome/updater/service_scope.h"
-#include "chrome/updater/win/control_service_proxy.h"
+#include "chrome/updater/win/update_service_internal_proxy.h"
 #include "chrome/updater/win/update_service_proxy.h"
 #include "chrome/updater/win/wrl_module.h"
 

chrome/updater/control_service.h → chrome/updater/update_service_internal.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_UPDATER_CONTROL_SERVICE_H_
-#define CHROME_UPDATER_CONTROL_SERVICE_H_
+#ifndef CHROME_UPDATER_UPDATE_SERVICE_INTERNAL_H_
+#define CHROME_UPDATER_UPDATE_SERVICE_INTERNAL_H_
 
 #include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
@@ -43,4 +43,4 @@ scoped_refptr<UpdateServiceInternal> CreateUpdateServiceInternal();
 
 }  // namespace updater
 
-#endif  // CHROME_UPDATER_CONTROL_SERVICE_H_
+#endif  // CHROME_UPDATER_UPDATE_SERVICE_INTERNAL_H_

chrome/updater/control_service_impl.cc → chrome/updater/update_service_internal_impl.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/updater/control_service_impl.h"
+#include "chrome/updater/update_service_internal_impl.h"
 
 #include <string>
 #include <vector>

chrome/updater/control_service_impl.h → chrome/updater/update_service_internal_impl.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_UPDATER_CONTROL_SERVICE_IMPL_H_
-#define CHROME_UPDATER_CONTROL_SERVICE_IMPL_H_
+#ifndef CHROME_UPDATER_UPDATE_SERVICE_INTERNAL_IMPL_H_
+#define CHROME_UPDATER_UPDATE_SERVICE_INTERNAL_IMPL_H_
 
 #include <string>
 #include <vector>
@@ -14,7 +14,7 @@
 #include "base/memory/scoped_refptr.h"
 #include "base/sequence_checker.h"
 #include "base/version.h"
-#include "chrome/updater/control_service.h"
+#include "chrome/updater/update_service_internal.h"
 
 namespace update_client {
 enum class Error;
@@ -104,4 +104,4 @@ class UpdateServiceInternalImpl : public UpdateServiceInternal {
 
 }  // namespace updater
 
-#endif  // CHROME_UPDATER_CONTROL_SERVICE_IMPL_H_
+#endif  // CHROME_UPDATER_UPDATE_SERVICE_INTERNAL_IMPL_H_

chrome/updater/control_service_impl_inactive.cc → chrome/updater/update_service_internal_impl_inactive.cc

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/updater/control_service_impl_inactive.h"
+#include "chrome/updater/update_service_internal_impl_inactive.h"
 
 #include "base/callback.h"
 #include "base/memory/scoped_refptr.h"
 #include "base/threading/sequenced_task_runner_handle.h"
-#include "chrome/updater/control_service.h"
+#include "chrome/updater/update_service_internal.h"
 
 namespace updater {
 

chrome/updater/control_service_impl_inactive.h → chrome/updater/update_service_internal_impl_inactive.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_UPDATER_CONTROL_SERVICE_IMPL_INACTIVE_H_
-#define CHROME_UPDATER_CONTROL_SERVICE_IMPL_INACTIVE_H_
+#ifndef CHROME_UPDATER_UPDATE_SERVICE_INTERNAL_IMPL_INACTIVE_H_
+#define CHROME_UPDATER_UPDATE_SERVICE_INTERNAL_IMPL_INACTIVE_H_
 
 #include "base/memory/scoped_refptr.h"
 
@@ -15,4 +15,4 @@ scoped_refptr<UpdateServiceInternal> MakeInactiveUpdateServiceInternal();
 
 }  // namespace updater
 
-#endif  // CHROME_UPDATER_CONTROL_SERVICE_IMPL_INACTIVE_H_
+#endif  // CHROME_UPDATER_UPDATE_SERVICE_INTERNAL_IMPL_INACTIVE_H_

chrome/updater/win/BUILD.gn

@@ -76,8 +76,6 @@ source_set("constants") {
 source_set("lib") {
   sources = [
     "action_handler.cc",
-    "control_service_proxy.cc",
-    "control_service_proxy.h",
     "group_policy_manager.cc",
     "group_policy_manager.h",
     "net/net_util.cc",
@@ -104,6 +102,8 @@ source_set("lib") {
     "setup/uninstall.h",
     "task_scheduler.cc",
     "task_scheduler.h",
+    "update_service_internal_proxy.cc",
+    "update_service_internal_proxy.h",
     "update_service_proxy.cc",
     "update_service_proxy.h",
     "user_info.cc",

chrome/updater/win/app_install_controller.cc

@@ -26,8 +26,8 @@
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "base/win/atl.h"
-#include "chrome/updater/control_service.h"
 #include "chrome/updater/update_service.h"
+#include "chrome/updater/update_service_internal.h"
 #include "chrome/updater/win/install_progress_observer.h"
 #include "chrome/updater/win/ui/progress_wnd.h"
 #include "chrome/updater/win/ui/resources/resources.grh"

chrome/updater/win/control_service_proxy.cc → chrome/updater/win/update_service_internal_proxy.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/updater/win/control_service_proxy.h"
+#include "chrome/updater/win/update_service_internal_proxy.h"
 
 #include <windows.h>
 #include <wrl/client.h>

chrome/updater/win/control_service_proxy.h → chrome/updater/win/update_service_internal_proxy.h

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_UPDATER_WIN_CONTROL_SERVICE_PROXY_H_
-#define CHROME_UPDATER_WIN_CONTROL_SERVICE_PROXY_H_
+#ifndef CHROME_UPDATER_WIN_UPDATE_SERVICE_INTERNAL_PROXY_H_
+#define CHROME_UPDATER_WIN_UPDATE_SERVICE_INTERNAL_PROXY_H_
 
 #include "base/callback_forward.h"
 #include "base/memory/scoped_refptr.h"
 #include "base/sequence_checker.h"
-#include "chrome/updater/control_service.h"
 #include "chrome/updater/service_scope.h"
+#include "chrome/updater/update_service_internal.h"
 
 namespace base {
 class SingleThreadTaskRunner;
@@ -44,4 +44,4 @@ class UpdateServiceInternalProxy : public UpdateServiceInternal {
 
 }  // namespace updater
 
-#endif  // CHROME_UPDATER_WIN_CONTROL_SERVICE_PROXY_H_
+#endif  // CHROME_UPDATER_WIN_UPDATE_SERVICE_INTERNAL_PROXY_H_