Remove support for specifying version on command line.

chrome/browser/first_run/upgrade_util_win.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/browser/first_run/upgrade_util.h"
 
 #include <windows.h>
 #include <shellapi.h>
 
 #include <algorithm>
@@ skipping 207 matching lines @@
     return false;
 
   // Open up the registry key containing current version and rename information.
   bool user_install =
       InstallUtil::IsPerUserInstall(cur_chrome_exe.value().c_str());
   HKEY reg_root = user_install ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE;
   BrowserDistribution *dist = BrowserDistribution::GetDistribution();
   base::win::RegKey key;
   if (key.Open(reg_root, dist->GetVersionKey().c_str(),
                KEY_QUERY_VALUE) == ERROR_SUCCESS) {
-
-    // Having just ascertained that we can swap, now check that we should: if
-    // we are given an explicit --chrome-version flag, don't rename unless the
-    // specified version matches the "pv" value. In practice, this is used to
-    // defer Chrome Frame updates until the current version of the Chrome Frame
-    // DLL component is loaded.
-    const CommandLine& cmd_line = *CommandLine::ForCurrentProcess();
-    if (cmd_line.HasSwitch(switches::kChromeVersion)) {
-      std::string version_string =
-          cmd_line.GetSwitchValueASCII(switches::kChromeVersion);
-      Version cmd_version(version_string);
-
-      std::wstring pv_value;
-      if (key.ReadValue(google_update::kRegVersionField,
-                        &pv_value) == ERROR_SUCCESS) {
-        Version pv_version(WideToASCII(pv_value));
-        if (cmd_version.IsValid() && pv_version.IsValid() &&
-            !cmd_version.Equals(pv_version)) {
-          return false;
-        }
-      }
-    }
-
     // First try to rename exe by launching rename command ourselves.
     std::wstring rename_cmd;
     if (key.ReadValue(google_update::kRegRenameCmdField,
                       &rename_cmd) == ERROR_SUCCESS) {
       base::win::ScopedHandle handle;
       base::LaunchOptions options;
       options.wait = true;
       options.start_hidden = true;
       if (base::LaunchProcess(rename_cmd, options, &handle)) {
         DWORD exit_code;
@@ skipping 18 matching lines @@
     return false;
   // At this point the chrome.exe has been swapped with the new one.
   if (!RelaunchChromeBrowser(command_line)) {
     // The re-launch fails. Feel free to panic now.
     NOTREACHED();
   }
   return true;
 }
 
 }  // namespace upgrade_util