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

content/gpu/gpu_info_collector_mac.mm

 // 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/gpu/gpu_info_collector.h"
 
 #include <vector>
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
@@ skipping 140 matching lines @@
       }
       break;
   }
   return (gpu_info->gpu.vendor_id && gpu_info->gpu.device_id);
 }
 
 }  // namespace anonymous
 
 namespace gpu_info_collector {
 
-bool CollectContextGraphicsInfo(content::GPUInfo* gpu_info) {
+bool CollectGraphicsInfo(content::GPUInfo* gpu_info) {
   DCHECK(gpu_info);
+  *gpu_info = content::GPUInfo();
 
   TRACE_EVENT0("gpu", "gpu_info_collector::CollectGraphicsInfo");
 
   gpu_info->can_lose_context =
       (gfx::GetGLImplementation() == gfx::kGLImplementationEGLGLES2);
   gpu_info->finalized = true;
   return CollectGraphicsInfoGL(gpu_info);
 }
 
-bool CollectBasicGraphicsInfo(content::GPUInfo* gpu_info) {
+bool CollectPreliminaryGraphicsInfo(content::GPUInfo* gpu_info) {
   DCHECK(gpu_info);
 
   std::string model_name;
   int32 model_major = 0, model_minor = 0;
   base::mac::ParseModelIdentifier(base::mac::GetModelIdentifier(),
                                   &model_name, &model_major, &model_minor);
   ReplaceChars(model_name, " ", "_", &gpu_info->machine_model);
   gpu_info->machine_model += " " + base::IntToString(model_major) +
                              "." + base::IntToString(model_minor);
 
   return CollectPCIVideoCardInfo(gpu_info);
 }
 
+bool CollectVideoCardInfo(content::GPUInfo* gpu_info) {
+  return CollectPreliminaryGraphicsInfo(gpu_info);
+}
+
 bool CollectDriverInfoGL(content::GPUInfo* gpu_info) {
   DCHECK(gpu_info);
 
   // Extract the OpenGL driver version string from the GL_VERSION string.
   // Mac OpenGL drivers have the driver version
   // at the end of the gl version string preceded by a dash.
   // Use some jiggery-pokery to turn that utf8 string into a std::wstring.
   std::string gl_version_string = gpu_info->gl_version_string;
   size_t pos = gl_version_string.find_last_of('-');
   if (pos == std::string::npos)
     return false;
   gpu_info->driver_version = gl_version_string.substr(pos + 1);
   return true;
 }
 
-void MergeGPUInfo(content::GPUInfo* basic_gpu_info,
-                  const content::GPUInfo& context_gpu_info) {
-  MergeGPUInfoGL(basic_gpu_info, context_gpu_info);
-}
-
 }  // namespace gpu_info_collector