Revert 173248, broke building on the official chrome/win bot:

content/test/gpu/gpu_test_config.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 "content/test/gpu/gpu_test_config.h"
 
 #include "base/logging.h"
 #include "base/sys_info.h"
 #include "content/gpu/gpu_info_collector.h"
 #include "content/public/common/gpu_info.h"
@@ skipping 194 matching lines @@
 
   if (!parser.ParseConfig(config_data, &config))
     return false;
   return Matches(config);
 }
 
 bool GPUTestBotConfig::LoadCurrentConfig(const content::GPUInfo* gpu_info) {
   bool rt;
   if (gpu_info == NULL) {
     content::GPUInfo my_gpu_info;
-    gpu_info_collector::CollectBasicGraphicsInfo(&my_gpu_info);
+    gpu_info_collector::CollectPreliminaryGraphicsInfo(&my_gpu_info);
     rt = SetGPUInfo(my_gpu_info);
   } else {
     rt = SetGPUInfo(*gpu_info);
   }
   set_os(GetCurrentOS());
   if (os() == kOsUnknown)
     rt = false;
 #if defined(NDEBUG)
   set_build_type(kBuildTypeRelease);
 #else
@@ skipping 16 matching lines @@
   GPUTestBotConfig my_config;
   if (!my_config.LoadCurrentConfig(NULL))
     return false;
   for (size_t i = 0 ; i < configs.size(); ++i) {
     if (my_config.Matches(configs[i]))
       return true;
   }
   return false;
 }