Add bits to indicate which parts of GPUInfo are collected.

gpu/config/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 "gpu/config/gpu_test_config.h"
 
 #include "base/logging.h"
 #include "base/sys_info.h"
 #include "gpu/config/gpu_info.h"
 #include "gpu/config/gpu_info_collector.h"
@@ skipping 215 matching lines @@
 
   if (!parser.ParseConfig(config_data, &config))
     return false;
   return Matches(config);
 }
 
 bool GPUTestBotConfig::LoadCurrentConfig(const GPUInfo* gpu_info) {
   bool rt;
   if (gpu_info == NULL) {
     GPUInfo my_gpu_info;
-    GpuIDResult result;
-    result = CollectGpuID(&my_gpu_info.gpu.vendor_id,
-                          &my_gpu_info.gpu.device_id);
-    if (result == kGpuIDNotSupported) {
+    CollectInfoResult result = CollectGpuID(
+        &my_gpu_info.gpu.vendor_id, &my_gpu_info.gpu.device_id);
+    if (result != kCollectInfoSuccess) {
       LOG(ERROR) << "Fail to identify GPU";
       DisableGPUInfoValidation();
       rt = true;
     } else {
       rt = SetGPUInfo(my_gpu_info);
     }
   } else {
     rt = SetGPUInfo(*gpu_info);
   }
   set_os(GetCurrentOS());
@@ skipping 41 matching lines @@
   // Blacklist rule #79 disables all Gpu acceleration before Windows 7.
   if (base::win::GetVersion() <= base::win::VERSION_VISTA) {
     return true;
   }
 #endif
   return false;
 }
 
 }  // namespace gpu