Callback flow to register Chrome and update shortcuts after OS upgrade to Windows 8

chrome/installer/util/app_command.cc

Index: chrome/installer/util/app_command.cc
diff --git a/chrome/installer/util/app_command.cc b/chrome/installer/util/app_command.cc
index 588fe86fda307d9615af880aee0c6813d1e3aa1f..93f347f11db923dc9a4b3d73ee85c7362b4e0af0 100644
--- a/chrome/installer/util/app_command.cc
+++ b/chrome/installer/util/app_command.cc
@@ -11,17 +11,42 @@
 
 namespace installer {
 
+namespace {
+
+// Adds a work item to set |value_name| to DWORD 1 if |value_data| is true;
+// adds a work item to remove |value_name| otherwise.
+WorkItem* AddSetOptionalBoolRegValueWorkItem(
+    HKEY predefined_root,
+    const string16& key_path,
+    const string16& value_name,
+    bool value_data,
+    WorkItemList* item_list) {
+  if (value_data) {
+    return item_list->AddSetRegValueWorkItem(predefined_root,
+                                             key_path,
+                                             value_name,
+                                             static_cast<DWORD>(1),
+                                             true);
+  } else {
+    return item_list->AddDeleteRegValueWorkItem(predefined_root,
+                                                key_path,
+                                                value_name);
+  }
+}
+
+}  // namespace
+
 AppCommand::AppCommand()
     : sends_pings_(false),
-      is_web_accessible_(false) {
+      is_web_accessible_(false),
+      is_auto_run_on_os_upgrade_(false) {
 }
 
-AppCommand::AppCommand(const std::wstring& command_line,
-                       bool sends_pings,
-                       bool is_web_accessible)
+AppCommand::AppCommand(const string16& command_line)
     : command_line_(command_line),
-      sends_pings_(sends_pings),
-      is_web_accessible_(is_web_accessible) {
+      sends_pings_(false),
+      is_web_accessible_(false),
+      is_auto_run_on_os_upgrade_(false) {
 }
 
 bool AppCommand::Initialize(const base::win::RegKey& key) {
@@ -31,9 +56,10 @@ bool AppCommand::Initialize(const base::win::RegKey& key) {
   }
 
   LONG result = ERROR_SUCCESS;
-  std::wstring cmd_line;
+  string16 cmd_line;
   DWORD sends_pings = 0;
   DWORD is_web_acc = 0;
+  DWORD is_auto_run_on_os_upgrade = 0;
 
   result = key.ReadValue(google_update::kRegCommandLineField, &cmd_line);
   if (result != ERROR_SUCCESS) {
@@ -42,47 +68,47 @@ bool AppCommand::Initialize(const base::win::RegKey& key) {
     return false;
   }
 
-  result = key.ReadValueDW(google_update::kRegSendsPingsField, &sends_pings);
-  if (result != ERROR_SUCCESS) {
-    LOG(WARNING) << "Error reading " << google_update::kRegSendsPingsField
-                 << " value from registry: " << result;
-    return false;
-  }
-
-  result = key.ReadValueDW(google_update::kRegWebAccessibleField, &is_web_acc);
-  if (result != ERROR_SUCCESS) {
-    LOG(WARNING) << "Error reading " << google_update::kRegWebAccessibleField
-                 << " value from registry: " << result;
-    return false;
-  }
+  // Note: ReadValueDW only modifies its out param on success.
+  key.ReadValueDW(google_update::kRegSendsPingsField, &sends_pings);
+  key.ReadValueDW(google_update::kRegWebAccessibleField, &is_web_acc);
+  key.ReadValueDW(google_update::kRegAutoRunOnOSUpgrade,
+                  &is_auto_run_on_os_upgrade);
 
   command_line_.swap(cmd_line);
   sends_pings_ = (sends_pings != 0);
   is_web_accessible_ = (is_web_acc != 0);
+  is_auto_run_on_os_upgrade_ = (is_auto_run_on_os_upgrade != 0);
 
   return true;
 }
 
 void AppCommand::AddWorkItems(HKEY predefined_root,
-                              const std::wstring& command_path,
+                              const string16& command_path,
                               WorkItemList* item_list) const {
-  const DWORD sends_pings = sends_pings_ ? 1U : 0U;
-  const DWORD is_web_accessible = is_web_accessible_ ? 1U : 0U;
-
   item_list->AddCreateRegKeyWorkItem(predefined_root, command_path)
-      ->set_log_message("creating quick-enable-cf command registry key");
+      ->set_log_message("creating AppCommand registry key");
   item_list->AddSetRegValueWorkItem(predefined_root, command_path,
                                     google_update::kRegCommandLineField,
                                     command_line_, true)
-      ->set_log_message("setting quick-enable-cf CommandLine registry value");
-  item_list->AddSetRegValueWorkItem(predefined_root, command_path,
-                                    google_update::kRegSendsPingsField,
-                                    sends_pings, true)
-      ->set_log_message("setting quick-enable-cf SendsPings registry value");
-  item_list->AddSetRegValueWorkItem(predefined_root, command_path,
-                                    google_update::kRegWebAccessibleField,
-                                    is_web_accessible, true)
-      ->set_log_message("setting quick-enable-cf WebAccessible registry value");
+      ->set_log_message("setting AppCommand CommandLine registry value");
+  AddSetOptionalBoolRegValueWorkItem(predefined_root,
+                                     command_path,
+                                     google_update::kRegSendsPingsField,
+                                     sends_pings_,
+                                     item_list)
+      ->set_log_message("setting AppCommand SendsPings registry value");
+  AddSetOptionalBoolRegValueWorkItem(predefined_root,
+                                     command_path,
+                                     google_update::kRegWebAccessibleField,
+                                     is_web_accessible_,
+                                     item_list)
+      ->set_log_message("setting AppCommand WebAccessible registry value");
+  AddSetOptionalBoolRegValueWorkItem(predefined_root,
+                                     command_path,
+                                     google_update::kRegAutoRunOnOSUpgrade,
+                                     is_auto_run_on_os_upgrade_,
+                                     item_list)
+      ->set_log_message("setting AppCommand AutoRunOnOSUpgrade registry value");
 }
 
 }  // namespace installer