Pass /nomitag to GoogleUpdateSetup.

chrome/installer/util/google_update_util.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/util/google_update_util.h"
 
 #include <algorithm>
 #include <map>
 #include <utility>
 #include <vector>
@@ skipping 23 matching lines @@
 
 const char kEnvVariableUntrustedData[] = "GoogleUpdateUntrustedData";
 const int kEnvVariableUntrustedDataMaxLength = 4096;
 
 // Returns true if Google Update is present at the given level.
 bool IsGoogleUpdatePresent(bool system_install) {
   // Using the existence of version key in the registry to decide.
   return GoogleUpdateSettings::GetGoogleUpdateVersion(system_install).IsValid();
 }
 
-// Returns GoogleUpdateSetup.exe's executable path at specified level.
+// Returns GoogleUpdate.exe's executable path at specified level.
 // or an empty path if none is found.
-FilePath GetGoogleUpdateSetupExe(bool system_install) {
+FilePath GetGoogleUpdateExe(bool system_install) {
   const HKEY root_key = system_install ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
   RegKey update_key;
 
   if (update_key.Open(root_key, kRegPathGoogleUpdate, KEY_QUERY_VALUE) ==
           ERROR_SUCCESS) {
     string16 path_str;
     string16 version_str;

[grt (UTC plus 2), 2013/02/12 18:31:56]

unused

-    if ((update_key.ReadValue(kRegPathField, &path_str) == ERROR_SUCCESS) &&
-        (update_key.ReadValue(kRegGoogleUpdateVersion, &version_str) ==
-             ERROR_SUCCESS)) {
-      return base::FilePath(path_str).DirName().Append(version_str).
-          Append(kGoogleUpdateSetupExe);
+    if ((update_key.ReadValue(kRegPathField, &path_str) == ERROR_SUCCESS)) {

[grt (UTC plus 2), 2013/02/12 18:31:56]

nit: no braces

+      return base::FilePath(path_str);
     }
   }
   return base::FilePath();
 }
 
 // If Google Update is present at system-level, sets |cmd_string| to the command
 // line to install Google Update at user-level and returns true.
 // Otherwise, clears |cmd_string| and returns false.
 bool GetUserLevelGoogleUpdateInstallCommandLine(string16* cmd_string) {
   cmd_string->clear();
-  base::FilePath google_update_setup(
-      GetGoogleUpdateSetupExe(true));  // system-level.
-  if (!google_update_setup.empty()) {
-    CommandLine cmd(google_update_setup);
+  base::FilePath google_update_exe(GetGoogleUpdateExe(true));  // system-level.
+  if (!google_update_exe.empty()) {
+    CommandLine cmd(google_update_exe);
     // Appends parameter "/install runtime=true&needsadmin=false /silent"
     // Constants are found in code.google.com/p/omaha/common/const_cmd_line.h.
     cmd.AppendArg("/install");
     // The "&" can be used in base::LaunchProcess() without quotation
     // (this is problematic only if run from command prompt).
     cmd.AppendArg("runtime=true&needsadmin=false");
     cmd.AppendArg("/silent");
     *cmd_string = cmd.GetCommandLineString();
   }
   return !cmd_string->empty();
@@ skipping 124 matching lines @@
     std::map<std::string, std::string>::const_iterator data_it(
         untrusted_data.find(key));
     if (data_it != untrusted_data.end())
       return data_it->second;
   }
 
   return std::string();
 }
 
 }  // namespace google_update