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

chrome/browser/ui/webui/help/version_updater_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 "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "base/version.h"
 #include "base/win/win_util.h"
@@ skipping 39 matching lines @@
                                const base::string16& error_message,
                                const base::string16& version) OVERRIDE;
 
   // Update the UI to show the status of the upgrade.
   void UpdateStatus(GoogleUpdateUpgradeResult result,
                     GoogleUpdateErrorCode error_code,
                     const base::string16& error_message);
 
   // Got the intalled version so the handling of the UPGRADE_ALREADY_UP_TO_DATE
   // result case can now be completeb on the UI thread.
-  void GotInstalledVersion(const base::Version& version);
+  void GotInstalledVersion(const Version& version);
 
   // Little helper function to create google_updater_.
   void CreateGoogleUpdater();
 
   // Helper function to clear google_updater_.
   void ClearGoogleUpdater();
 
   // Returns a window that can be used for elevation.
   HWND GetElevationParent();
 
@@ skipping 41 matching lines @@
 
  private:
   friend class base::RefCountedThreadSafe<VersionReader>;
 
   // The version updater that must be called back when we are done.
   // We use a weak pointer in case the updater gets destroyed while waiting.
   base::WeakPtr<VersionUpdaterWin> version_updater_;
 
   // This is the version that gets read in the FILE thread and set on the
   // the updater in the UI thread.
-  base::Version installed_version_;
+  Version installed_version_;
 };
 
 VersionUpdaterWin::VersionUpdaterWin()
     : weak_factory_(this) {
   CreateGoogleUpdater();
 }
 
 VersionUpdaterWin::~VersionUpdaterWin() {
   // The Google Updater will hold a pointer to the listener until it reports
   // status, so that pointer must be cleared when the listener is destoyed.
@@ skipping 101 matching lines @@
       break;
     }
   }
 
   // TODO(mad): Get proper progress value instead of passing 0.
   // http://crbug.com/136117
   callback_.Run(status, 0, message);
 #endif  //  defined(GOOGLE_CHROME_BUILD)
 }
 
-void VersionUpdaterWin::GotInstalledVersion(const base::Version& version) {
+void VersionUpdaterWin::GotInstalledVersion(const Version& version) {
   // This must be called on the UI thread so that callback_ can be called.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Make sure that the latest version is running and if not,
   // notify the user by setting the status to NEARLY_UPDATED.
   //
   // The extra version check is necessary on Windows because the application
   // may be already up to date on disk though the running app is still
   // out of date.
   chrome::VersionInfo version_info;
-  base::Version running_version(version_info.Version());
+  Version running_version(version_info.Version());
   if (!version.IsValid() || version.CompareTo(running_version) <= 0) {
     content::RecordAction(
         UserMetricsAction("UpgradeCheck_AlreadyUpToDate"));
     callback_.Run(UPDATED, 0, base::string16());
   } else {
     content::RecordAction(UserMetricsAction("UpgradeCheck_AlreadyUpgraded"));
     callback_.Run(NEARLY_UPDATED, 0, base::string16());
   }
 }
 
@@ skipping 33 matching lines @@
                          << GetCurrentThreadId();
 #endif
   return window;
 }
 
 }  // namespace
 
 VersionUpdater* VersionUpdater::Create() {
   return new VersionUpdaterWin;
 }