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

gpu/config/gpu_info_collector_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 "gpu/config/gpu_info_collector.h"
 
 // This has to be included before windows.h.
 #include "third_party/re2/re2/re2.h"
 
 #include <windows.h>
@@ skipping 152 matching lines @@
                               stats.gaming * 10, 10, 200, 50);
   UMA_HISTOGRAM_BOOLEAN(
       "GPU.WinSAT.HasResults",
       stats.overall != 0.0 && stats.graphics != 0.0 && stats.gaming != 0.0);
 
   return stats;
 }
 
 // Returns the display link driver version or an invalid version if it is
 // not installed.
-base::Version DisplayLinkVersion() {
+Version DisplayLinkVersion() {
   base::win::RegKey key;
 
   if (key.Open(HKEY_LOCAL_MACHINE, L"SOFTWARE", KEY_READ | KEY_WOW64_64KEY))
-    return base::Version();
+    return Version();
 
   if (key.OpenKey(L"DisplayLink", KEY_READ | KEY_WOW64_64KEY))
-    return base::Version();
+    return Version();
 
   if (key.OpenKey(L"Core", KEY_READ | KEY_WOW64_64KEY))
-    return base::Version();
+    return Version();
 
   base::string16 version;
   if (key.ReadValue(L"Version", &version))
-    return base::Version();
+    return Version();
 
-  return base::Version(WideToASCII(version));
+  return Version(WideToASCII(version));
 }
 
 // Returns whether Lenovo dCute is installed.
 bool IsLenovoDCuteInstalled() {
   base::win::RegKey key;
 
   if (key.Open(HKEY_LOCAL_MACHINE, L"SOFTWARE", KEY_READ | KEY_WOW64_64KEY))
     return false;
 
   if (key.OpenKey(L"Lenovo", KEY_READ | KEY_WOW64_64KEY))
@@ skipping 444 matching lines @@
     basic_gpu_info->software_rendering = true;
     return;
   }
 
   MergeGPUInfoGL(basic_gpu_info, context_gpu_info);
 
   basic_gpu_info->dx_diagnostics = context_gpu_info.dx_diagnostics;
 }
 
 }  // namespace gpu