Various cleanups.

chrome/installer/mini_installer/configuration.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/installer/mini_installer/configuration.h"
 
 #include <windows.h>
 #include <shellapi.h>  // NOLINT
 #include <stddef.h>
 
@@ skipping 39 matching lines @@
 void Configuration::Clear() {
   if (args_ != NULL) {
     ::LocalFree(args_);
     args_ = NULL;
   }
   chrome_app_guid_ = google_update::kAppGuid;
   command_line_ = NULL;
   operation_ = INSTALL_PRODUCT;
   argument_count_ = 0;
   is_system_level_ = false;
-  is_side_by_side_ = false;
   is_updating_multi_chrome_ = false;
   has_invalid_switch_ = false;
   previous_version_ = NULL;
 }
 
 // |command_line| is shared with this instance in the sense that this
 // instance may refer to it at will throughout its lifetime, yet it will
 // not release it.
 bool Configuration::ParseCommandLine(const wchar_t* command_line) {
   command_line_ = command_line;
   args_ = ::CommandLineToArgvW(command_line_, &argument_count_);
   if (!args_)
     return false;
 
   for (int i = 1; i < argument_count_; ++i) {
-    if (0 == ::lstrcmpi(args_[i], L"--system-level")) {
+    if (0 == ::lstrcmpi(args_[i], L"--system-level"))
       is_system_level_ = true;
 #if defined(GOOGLE_CHROME_BUILD)
-    } else if (0 == ::lstrcmpi(args_[i], L"--chrome-sxs")) {
-      is_side_by_side_ = true;
+    else if (0 == ::lstrcmpi(args_[i], L"--chrome-sxs"))
       chrome_app_guid_ = google_update::kSxSAppGuid;
 #endif
-    } else if (0 == ::lstrcmpi(args_[i], L"--cleanup")) {
+    else if (0 == ::lstrcmpi(args_[i], L"--cleanup"))
       operation_ = CLEANUP;
-    } else if (0 == ::lstrcmpi(args_[i], L"--chrome-frame")) {
+    else if (0 == ::lstrcmpi(args_[i], L"--chrome-frame"))
       has_invalid_switch_ = true;
-    }
   }
 
   if (!is_system_level_)
     is_system_level_ = GetGoogleUpdateIsMachineEnvVar();
 
   is_updating_multi_chrome_ = IsUpdatingMultiChrome();
 
   return true;
 }
 
@@ skipping 21 matching lines @@
 
   // The string must be terminated.
   if (version_string[version_len - 1])
     return;
 
   previous_version_ = version_string;
 }
 
 bool Configuration::IsUpdatingMultiChrome() const {
 #if defined(GOOGLE_CHROME_BUILD)
-  // SxS/canary does not support multi-install.
-  if (is_side_by_side_)
+  // Only primary Chrome installs supported multi-install (not canary/SxS).
+  if (chrome_app_guid_ != google_update::kAppGuid)
     return false;
 
   // Is Chrome already installed as multi-install?
   const HKEY root = is_system_level_ ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
   StackString<128> value;
   RegKey key;
-  return (OpenClientsKey(root, google_update::kAppGuid, KEY_QUERY_VALUE,
-                         &key) == ERROR_SUCCESS &&
+  return (OpenClientsKey(root, chrome_app_guid_, KEY_QUERY_VALUE, &key) ==
+              ERROR_SUCCESS &&
           key.ReadSZValue(kPvRegistryValue, value.get(), value.capacity()) ==
               ERROR_SUCCESS &&
           value.length() != 0 &&
-          OpenClientStateKey(root, google_update::kAppGuid, KEY_QUERY_VALUE,
-                             &key) == ERROR_SUCCESS &&
+          OpenClientStateKey(root, chrome_app_guid_, KEY_QUERY_VALUE, &key) ==
+              ERROR_SUCCESS &&
           key.ReadSZValue(kUninstallArgumentsRegistryValue, value.get(),
                           value.capacity()) == ERROR_SUCCESS &&
           value.findi(L"--multi-install") != nullptr);
 #else
   return false;
 #endif
 }
 
 }  // namespace mini_installer