Rename --ua to --wake for chrome/updater.

This is a mechanical change to lexically remove references
to --ua and UpdateApps and replace them with --wake and
Wake.

Bug: 1084010
Change-Id: I1c0a8fa33f160f2d769549026725546c75c54854
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2209619Reviewed-by: S. Ganesh <ganesh@chromium.org>
Commit-Queue: Sorin Jianu <sorin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#770381}

chrome/updater/BUILD.gn

@@ -97,8 +97,8 @@ if (is_win || is_mac) {
       "app/app.h",
       "app/app_uninstall.cc",
       "app/app_uninstall.h",
-      "app/app_update_all.cc",
-      "app/app_update_all.h",
+      "app/app_wake.cc",
+      "app/app_wake.h",
       "configurator.cc",
       "configurator.h",
       "installer.cc",

chrome/updater/app/app_update_all.cc → chrome/updater/app/app_wake.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/app/app_update_all.h"
+#include "chrome/updater/app/app_wake.h"
 
 #include <utility>
 
@@ -15,12 +15,12 @@
 
 namespace updater {
 
-class AppUpdateAll : public App {
+class AppWake : public App {
  public:
-  AppUpdateAll() = default;
+  AppWake() = default;
 
  private:
-  ~AppUpdateAll() override = default;
+  ~AppWake() override = default;
 
   // Overrides for App.
   void FirstTaskRun() override;
@@ -31,16 +31,16 @@ class AppUpdateAll : public App {
   scoped_refptr<UpdateService> update_service_;
 };
 
-void AppUpdateAll::Initialize() {
+void AppWake::Initialize() {
   config_ = base::MakeRefCounted<Configurator>();
 }
 
-void AppUpdateAll::Uninitialize() {
+void AppWake::Uninitialize() {
   update_service_->Uninitialize();
 }
 
-// AppUpdateAll triggers an update of all registered applications.
-void AppUpdateAll::FirstTaskRun() {
+// AppWake triggers an update of all registered applications.
+void AppWake::FirstTaskRun() {
   update_service_ = CreateUpdateService(config_);
   update_service_->UpdateAll(
       base::BindRepeating([](UpdateService::UpdateState) {}),
@@ -50,11 +50,11 @@ void AppUpdateAll::FirstTaskRun() {
             VLOG(0) << "UpdateAll complete: exit_code = " << exit_code;
             std::move(quit).Run(exit_code);
           },
-          base::BindOnce(&AppUpdateAll::Shutdown, this)));
+          base::BindOnce(&AppWake::Shutdown, this)));
 }
 
-scoped_refptr<App> AppUpdateAllInstance() {
-  return AppInstance<AppUpdateAll>();
+scoped_refptr<App> AppWakeInstance() {
+  return AppInstance<AppWake>();
 }
 
 }  // namespace updater

chrome/updater/app/app_update_all.h → chrome/updater/app/app_wake.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_APP_APP_UPDATE_ALL_H_
-#define CHROME_UPDATER_APP_APP_UPDATE_ALL_H_
+#ifndef CHROME_UPDATER_APP_APP_WAKE_H_
+#define CHROME_UPDATER_APP_APP_WAKE_H_
 
 #include "base/memory/scoped_refptr.h"
 
@@ -11,8 +11,8 @@ namespace updater {
 
 class App;
 
-scoped_refptr<App> AppUpdateAllInstance();
+scoped_refptr<App> AppWakeInstance();
 
 }  // namespace updater
 
-#endif  // CHROME_UPDATER_APP_APP_UPDATE_ALL_H_
+#endif  // CHROME_UPDATER_APP_APP_WAKE_H_

chrome/updater/constants.cc

@@ -18,7 +18,6 @@ const char kCrashMeSwitch[] = "crash-me";
 const char kCrashHandlerSwitch[] = "crash-handler";
 const char kInstallSwitch[] = "install";
 const char kUninstallSwitch[] = "uninstall";
-const char kUpdateAppsSwitch[] = "ua";
 const char kSystemSwitch[] = "system";
 const char kTestSwitch[] = "test";
 const char kInitDoneNotifierSwitch[] = "init-done-notifier";
@@ -27,9 +26,9 @@ const char kEnableLoggingSwitch[] = "enable-logging";
 const char kLoggingModuleSwitch[] = "vmodule";
 const char kSingleProcessSwitch[] = "single-process";
 const char kAppIdSwitch[] = "appid";
+const char kWakeSwitch[] = "wake";
 
 #if defined(OS_MACOSX)
-const char kWakeSwitch[] = "wake";
 const char kPromoteCandidateSwitch[] = "promote-candidate";
 const char kUninstallCandidateSwitch[] = "uninstall-candidate";
 #endif  // OS_MACOSX

chrome/updater/constants.h

@@ -60,10 +60,9 @@ extern const char kInstallSwitch[];
 // Swaps the current version of the updater with the newly installed one.
 // Performs clean-up.
 extern const char kPromoteCandidateSwitch[];
-// TODO: crbug 1072061
-// This switch should not be shipped.
+
+// TODO(crbug 1072061): this switch should not be shipped.
 extern const char kUninstallCandidateSwitch[];
-extern const char kWakeSwitch[];
 #endif  // OS_MACOSX
 
 #if defined(OS_WIN)
@@ -77,10 +76,9 @@ extern const char kInstallFromOutDir[];
 // Uninstalls the updater.
 extern const char kUninstallSwitch[];
 
-// Updates all apps registered with the updater.
-// TODO: crbug 1084010
-// This switch should be removed, as the new design relies on kWakeSwitch.
-extern const char kUpdateAppsSwitch[];
+// Kicks off the update service. This switch is typically used for by a
+// scheduled to invoke the updater periodically.
+extern const char kWakeSwitch[];
 
 // The updater needs to operate in the system context.
 extern const char kSystemSwitch[];

chrome/updater/test/integration_tests_win.cc

@@ -66,7 +66,7 @@ void Clean() {
   // TODO(crbug.com/1062288): Delete the COM server items.
   // TODO(crbug.com/1062288): Delete the COM service items.
   // TODO(crbug.com/1062288): Delete the COM interfaces.
-  // TODO(crbug.com/1062288): Delete the UpdateApps task.
+  // TODO(crbug.com/1062288): Delete the Wake task.
   EXPECT_TRUE(base::DeleteFile(GetProductPath(), true));
 }
 
@@ -76,7 +76,7 @@ void ExpectClean() {
   // TODO(crbug.com/1062288): Assert there are no COM server items.
   // TODO(crbug.com/1062288): Assert there are no COM service items.
   // TODO(crbug.com/1062288): Assert there are no COM interfaces.
-  // TODO(crbug.com/1062288): Assert there are no UpdateApps tasks.
+  // TODO(crbug.com/1062288): Assert there are no Wake tasks.
 
   // Files must not exist on the file system.
 
@@ -89,7 +89,7 @@ void ExpectInstalled() {
   // TODO(crbug.com/1062288): Assert there are COM server items.
   // TODO(crbug.com/1062288): Assert there are COM service items. (Maybe.)
   // TODO(crbug.com/1062288): Assert there are COM interfaces.
-  // TODO(crbug.com/1062288): Assert there are UpdateApps tasks.
+  // TODO(crbug.com/1062288): Assert there are Wake tasks.
 
   // Files must exist on the file system.
   EXPECT_TRUE(base::PathExists(GetProductPath()));

chrome/updater/updater.cc

@@ -11,7 +11,7 @@
 #include "build/build_config.h"
 #include "chrome/updater/app/app.h"
 #include "chrome/updater/app/app_uninstall.h"
-#include "chrome/updater/app/app_update_all.h"
+#include "chrome/updater/app/app_wake.h"
 #include "chrome/updater/configurator.h"
 #include "chrome/updater/constants.h"
 #include "chrome/updater/crash_client.h"
@@ -111,8 +111,8 @@ int HandleUpdaterCommands(const base::CommandLine* command_line) {
   if (command_line->HasSwitch(kUninstallSwitch))
     return AppUninstallInstance()->Run();
 
-  if (command_line->HasSwitch(kUpdateAppsSwitch)) {
-    return AppUpdateAllInstance()->Run();
+  if (command_line->HasSwitch(kWakeSwitch)) {
+    return AppWakeInstance()->Run();
   }
 
   VLOG(1) << "Unknown command line switch.";

chrome/updater/win/setup/setup.cc

@@ -250,18 +250,18 @@ int Setup(bool is_machine) {
   AddComInterfacesWorkItems(key, product_dir.Append(kUpdaterExe),
                             install_list.get());
 
-  base::CommandLine run_updater_ua_command(product_dir.Append(kUpdaterExe));
-  run_updater_ua_command.AppendSwitch(kUpdateAppsSwitch);
+  base::CommandLine run_updater_wake_command(product_dir.Append(kUpdaterExe));
+  run_updater_wake_command.AppendSwitch(kWakeSwitch);
 
 #if !defined(NDEBUG)
-  run_updater_ua_command.AppendSwitch(kEnableLoggingSwitch);
-  run_updater_ua_command.AppendSwitchASCII(kLoggingModuleSwitch,
-                                           "*/chrome/updater/*=2");
+  run_updater_wake_command.AppendSwitch(kEnableLoggingSwitch);
+  run_updater_wake_command.AppendSwitchASCII(kLoggingModuleSwitch,
+                                             "*/chrome/updater/*=2");
 #endif
-  if (!install_list->Do() || !RegisterUpdateAppsTask(run_updater_ua_command)) {
+  if (!install_list->Do() || !RegisterWakeTask(run_updater_wake_command)) {
     LOG(ERROR) << "Install failed, rolling back...";
     install_list->Rollback();
-    UnregisterUpdateAppsTask();
+    UnregisterWakeTask();
     LOG(ERROR) << "Rollback complete.";
     return -1;
   }

chrome/updater/win/setup/setup_util.cc

@@ -30,19 +30,19 @@ constexpr base::char16 kTaskDescription[] = L"Update all applications.";
 
 }  // namespace
 
-bool RegisterUpdateAppsTask(const base::CommandLine& run_command) {
+bool RegisterWakeTask(const base::CommandLine& run_command) {
   auto task_scheduler = TaskScheduler::CreateInstance();
   if (!task_scheduler->RegisterTask(
           kTaskName, kTaskDescription, run_command,
           TaskScheduler::TriggerType::TRIGGER_TYPE_HOURLY, true)) {
-    LOG(ERROR) << "RegisterUpdateAppsTask failed.";
+    LOG(ERROR) << "RegisterWakeTask failed.";
     return false;
   }
-  VLOG(1) << "RegisterUpdateAppsTask succeeded.";
+  VLOG(1) << "RegisterWakeTask succeeded.";
   return true;
 }
 
-void UnregisterUpdateAppsTask() {
+void UnregisterWakeTask() {
   auto task_scheduler = TaskScheduler::CreateInstance();
   task_scheduler->DeleteTask(kTaskName);
 }

chrome/updater/win/setup/setup_util.h

@@ -19,8 +19,8 @@ class FilePath;
 
 namespace updater {
 
-bool RegisterUpdateAppsTask(const base::CommandLine& run_command);
-void UnregisterUpdateAppsTask();
+bool RegisterWakeTask(const base::CommandLine& run_command);
+void UnregisterWakeTask();
 
 base::string16 GetComServerClsidRegistryPath(REFCLSID clsid);
 base::string16 GetComServiceClsid();

chrome/updater/win/setup/uninstall.cc

@@ -81,7 +81,7 @@ int Uninstall(bool is_machine) {
       std::make_unique<base::win::ScopedCOMInitializer>(
           base::win::ScopedCOMInitializer::kMTA);
 
-  updater::UnregisterUpdateAppsTask();
+  updater::UnregisterWakeTask();
 
   std::unique_ptr<WorkItemList> uninstall_list(WorkItem::CreateWorkItemList());
   uninstall_list->AddDeleteRegKeyWorkItem(key, base::ASCIIToUTF16(UPDATER_KEY),