Only collect GL/D3D context specific GPUInfo in GPU process

content/gpu/gpu_info_collector_mac.mm

Index: content/gpu/gpu_info_collector_mac.mm
===================================================================
--- content/gpu/gpu_info_collector_mac.mm	(revision 173184)
+++ content/gpu/gpu_info_collector_mac.mm	(working copy)
@@ -158,9 +158,8 @@
 
 namespace gpu_info_collector {
 
-bool CollectGraphicsInfo(content::GPUInfo* gpu_info) {
+bool CollectContextGraphicsInfo(content::GPUInfo* gpu_info) {
   DCHECK(gpu_info);
-  *gpu_info = content::GPUInfo();
 
   TRACE_EVENT0("gpu", "gpu_info_collector::CollectGraphicsInfo");
 
@@ -170,7 +169,7 @@
   return CollectGraphicsInfoGL(gpu_info);
 }
 
-bool CollectPreliminaryGraphicsInfo(content::GPUInfo* gpu_info) {
+bool CollectBasicGraphicsInfo(content::GPUInfo* gpu_info) {
   DCHECK(gpu_info);
 
   std::string model_name;
@@ -184,10 +183,6 @@
   return CollectPCIVideoCardInfo(gpu_info);
 }
 
-bool CollectVideoCardInfo(content::GPUInfo* gpu_info) {
-  return CollectPreliminaryGraphicsInfo(gpu_info);
-}
-
 bool CollectDriverInfoGL(content::GPUInfo* gpu_info) {
   DCHECK(gpu_info);
 
@@ -203,4 +198,9 @@
   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