Update all users of base::Version to explicitly specify the namespace, and clean up the header.

chrome/app/client_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 <windows.h>
 #include <shlwapi.h>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/environment.h"
@@ skipping 184 matching lines @@
     return base::string16();
   base::string16 exe_path(path);
   return exe_path.append(1, L'\\');
 }
 
 base::string16 GetCurrentModuleVersion() {
   scoped_ptr<FileVersionInfo> file_version_info(
       FileVersionInfo::CreateFileVersionInfoForCurrentModule());
   if (file_version_info.get()) {
     base::string16 version_string(file_version_info->file_version());
-    if (Version(WideToASCII(version_string)).IsValid())
+    if (base::Version(WideToASCII(version_string)).IsValid())
       return version_string;
   }
   return base::string16();
 }
 
 //=============================================================================
 
 MainDllLoader::MainDllLoader() : dll_(NULL) {
 }
 
@@ skipping 15 matching lines @@
   const base::string16 dir(GetExecutablePath());
   *out_file = dir;
   HMODULE dll = LoadChromeWithDirectory(out_file);
   if (!dll) {
     // Loading from same directory (for developers) failed.
     base::string16 version_string;
     if (cmd_line.HasSwitch(switches::kChromeVersion)) {
       // This is used to support Chrome Frame, see http://crbug.com/88589.
       version_string = cmd_line.GetSwitchValueNative(switches::kChromeVersion);
 
-      if (!Version(WideToASCII(version_string)).IsValid()) {
+      if (!base::Version(WideToASCII(version_string)).IsValid()) {
         // If a bogus command line flag was given, then abort.
         LOG(ERROR) << "Invalid command line version: " << version_string;
         return NULL;
       }
     }
 
     // If no version on the command line, then look at the version resource in
     // the current module and try loading that.
     if (version_string.empty())
       version_string = GetCurrentModuleVersion();
@@ skipping 99 matching lines @@
   }
 };
 
 MainDllLoader* MakeMainDllLoader() {
 #if defined(GOOGLE_CHROME_BUILD)
   return new ChromeDllLoader();
 #else
   return new ChromiumDllLoader();
 #endif
 }