Revert "Update all users of base::Version to explicitly specify the namespace, and clean up the hea…

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 217 matching lines @@
 
     // 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);
-      base::Version cmd_version(version_string);
+      Version cmd_version(version_string);
 
       std::wstring pv_value;
       if (key.ReadValue(google_update::kRegVersionField,
                         &pv_value) == ERROR_SUCCESS) {
-        base::Version pv_version(WideToASCII(pv_value));
+        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,
@@ skipping 25 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