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

chrome/installer/util/google_update_settings.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_settings.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 567 matching lines @@
   RegKey update_key;
 
   if (update_key.Open(root_key, google_update::kRegPathGoogleUpdate,
                       KEY_QUERY_VALUE) == ERROR_SUCCESS) {
     update_key.ReadValue(google_update::kRegUninstallCmdLine, &cmd_line);
   }
 
   return cmd_line;
 }
 
-base::Version GoogleUpdateSettings::GetGoogleUpdateVersion(
-    bool system_install) {
+Version GoogleUpdateSettings::GetGoogleUpdateVersion(bool system_install) {
   const HKEY root_key = system_install ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
   base::string16 version;
   RegKey key;
 
   if (key.Open(root_key,
                google_update::kRegPathGoogleUpdate,
                KEY_QUERY_VALUE) == ERROR_SUCCESS &&
       key.ReadValue(google_update::kRegGoogleUpdateVersion,
                     &version) == ERROR_SUCCESS) {
-    return base::Version(base::UTF16ToUTF8(version));
+    return Version(base::UTF16ToUTF8(version));
   }
 
-  return base::Version();
+  return Version();
 }
 
 base::Time GoogleUpdateSettings::GetGoogleUpdateLastStartedAU(
     bool system_install) {
   const HKEY root_key = system_install ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
   RegKey update_key;
 
   if (update_key.Open(root_key, google_update::kRegPathGoogleUpdate,
                       KEY_QUERY_VALUE) == ERROR_SUCCESS) {
     DWORD last_start;
@@ skipping 137 matching lines @@
   }
 
   // If the key or value was not present, return the empty string.
   if (result == ERROR_FILE_NOT_FOUND || result == ERROR_PATH_NOT_FOUND) {
     experiment_labels->clear();
     return true;
   }
 
   return result == ERROR_SUCCESS;
 }