Support migrating multi-install Chrome to single-install.

chrome/installer/util/installer_state.cc

Index: chrome/installer/util/installer_state.cc
diff --git a/chrome/installer/util/installer_state.cc b/chrome/installer/util/installer_state.cc
index 520fd58e2e4154a6176b9748ea6612fdba82009c..fe6c8d01f97b8ee78c5b7f6139d5535acbb17752 100644
--- a/chrome/installer/util/installer_state.cc
+++ b/chrome/installer/util/installer_state.cc
@@ -713,29 +713,15 @@ void InstallerState::AddComDllList(
                              com_dll_list));
 }
 
-bool InstallerState::SetChannelFlags(bool set,
-                                     ChannelInfo* channel_info) const {
-  bool modified = false;
-  for (Products::const_iterator scan = products_.begin(), end = products_.end();
-       scan != end; ++scan) {
-     modified |= (*scan)->SetChannelFlags(set, channel_info);
-  }
-  return modified;
-}
-
 void InstallerState::UpdateStage(installer::InstallerStage stage) const {
   InstallUtil::UpdateInstallerStage(system_install(), state_key_, stage);
 }
 
 void InstallerState::UpdateChannels() const {
-  if (operation_ != MULTI_INSTALL && operation_ != MULTI_UPDATE) {
-    VLOG(1) << "InstallerState::UpdateChannels noop: " << operation_;
-    return;
-  }
-
-  // Update the "ap" value for the product being installed/updated.  We get the
-  // current value from the registry since the InstallationState instance used
-  // by the bulk of the installer does not track changes made by UpdateStage.
+  DCHECK_NE(UNINSTALL, operation_);
+  // Update the "ap" value for the product being installed/updated.  Use the
+  // current value in the registry since the InstallationState instance used by
+  // the bulk of the installer does not track changes made by UpdateStage.
   // Create the app's ClientState key if it doesn't exist.
   ChannelInfo channel_info;
   base::win::RegKey state_key;
@@ -744,13 +730,22 @@ void InstallerState::UpdateChannels() const {
                        state_key_.c_str(),
                        KEY_QUERY_VALUE | KEY_SET_VALUE | KEY_WOW64_32KEY);
   if (result == ERROR_SUCCESS) {
+    bool modified = false;

[robertshield, 2015/01/23 22:45:30]

why declare this up here and then |= it below wouldn't it be equivalent to keep
it declared on 737?

[grt (UTC plus 2), 2015/01/24 02:25:16]

Yeah, that's better. This is an artifact of a previous hacking in here.

     channel_info.Initialize(state_key);
 
     // This is a multi-install product.
-    bool modified = channel_info.SetMultiInstall(true);
-
-    // Add the appropriate modifiers for all products and their options.
-    modified |= SetChannelFlags(true, &channel_info);
+    modified |= channel_info.SetMultiInstall(is_multi_install());
+
+    if (is_multi_install()) {
+      // Add the appropriate modifiers for all products and their options.
+      for (auto* product : products_)
+        modified |= product->SetChannelFlags(true, &channel_info);
+    } else {
+      // Remove all multi-install products from the channel name.
+      modified |= channel_info.SetChrome(false);
+      modified |= channel_info.SetChromeFrame(false);
+      modified |= channel_info.SetAppLauncher(false);
+    }
 
     VLOG(1) << "ap: " << channel_info.value();
 
@@ -758,40 +753,42 @@ void InstallerState::UpdateChannels() const {
     if (modified)
       channel_info.Write(&state_key);
 
-    // Remove the -stage: modifier since we don't want to propagate that to the
-    // other app_guids.
-    channel_info.SetStage(NULL);
-
-    // Synchronize the other products and the package with this one.
-    ChannelInfo other_info;
-    for (int i = 0; i < BrowserDistribution::NUM_TYPES; ++i) {
-      BrowserDistribution::Type type =
-          static_cast<BrowserDistribution::Type>(i);
-      // Skip the app_guid we started with.
-      if (type == state_type_)
-        continue;
-      BrowserDistribution* dist = NULL;
-      // Always operate on the binaries.
-      if (i == BrowserDistribution::CHROME_BINARIES) {
-        dist = multi_package_distribution_;
-      } else {
-        const Product* product = FindProduct(type);
-        // Skip this one if it's for a product we're not operating on.
-        if (product == NULL)
+    if (is_multi_install()) {
+      // Remove the -stage: modifier since we don't want to propagate that to
+      // the other app_guids.
+      channel_info.SetStage(NULL);
+
+      // Synchronize the other products and the package with this one.
+      ChannelInfo other_info;
+      for (int i = 0; i < BrowserDistribution::NUM_TYPES; ++i) {
+        BrowserDistribution::Type type =
+            static_cast<BrowserDistribution::Type>(i);
+        // Skip the app_guid we started with.
+        if (type == state_type_)
           continue;
-        dist = product->distribution();
-      }
-      result =
-          state_key.Create(root_key_,
-                           dist->GetStateKey().c_str(),
-                           KEY_QUERY_VALUE | KEY_SET_VALUE | KEY_WOW64_32KEY);
-      if (result == ERROR_SUCCESS) {
-        other_info.Initialize(state_key);
-        if (!other_info.Equals(channel_info))
-          channel_info.Write(&state_key);
-      } else {
-        LOG(ERROR) << "Failed opening key " << dist->GetStateKey()
-                   << " to update app channels; result: " << result;
+        BrowserDistribution* dist = NULL;
+        // Always operate on the binaries.
+        if (i == BrowserDistribution::CHROME_BINARIES) {
+          dist = multi_package_distribution_;
+        } else {
+          const Product* product = FindProduct(type);
+          // Skip this one if it's for a product we're not operating on.
+          if (product == NULL)
+            continue;
+          dist = product->distribution();
+        }
+        result =
+            state_key.Create(root_key_,
+                             dist->GetStateKey().c_str(),
+                             KEY_QUERY_VALUE | KEY_SET_VALUE | KEY_WOW64_32KEY);
+        if (result == ERROR_SUCCESS) {
+          other_info.Initialize(state_key);
+          if (!other_info.Equals(channel_info))
+            channel_info.Write(&state_key);
+        } else {
+          LOG(ERROR) << "Failed opening key " << dist->GetStateKey()
+                     << " to update app channels; result: " << result;
+        }
       }
     }
   } else {