Figure out whether we have enough information to make the final GPU blacklisting decision.

content/browser/gpu/gpu_data_manager_impl.cc

Index: content/browser/gpu/gpu_data_manager_impl.cc
===================================================================
--- content/browser/gpu/gpu_data_manager_impl.cc	(revision 160744)
+++ content/browser/gpu/gpu_data_manager_impl.cc	(working copy)
@@ -299,7 +299,15 @@
   // than those in the preliminary gpu feature flags because the latter work
   // through renderer commandline switches.
   uint32 mask = ~(preliminary_gpu_feature_type_);
-  return (gpu_feature_type_ & mask) == 0;
+  if ((gpu_feature_type_ & mask) != 0)

[Ken Russell (switch to Gerrit), 2012/10/09 18:52:55]

At some point we really should rename confusingly named variables like
"gpu_feature_type_". They make it difficult to read through code like this
quickly and figure out what it's doing.

[Zhenyao Mo, 2012/10/09 19:20:47]

Will do in a follow-up CL.

+    return false;
+
+  if (gpu_feature_type_ == content::GPU_FEATURE_TYPE_ALL) {
+    if (gpu_blacklist_.get() && !gpu_blacklist_->needs_more_info())
+      return false;
+  }
+
+  return true;
 }
 
 void GpuDataManagerImpl::HandleGpuSwitch() {
@@ -411,6 +419,9 @@
     command_line->AppendSwitchASCII(switches::kSupportsDualGpus, "false");
   }
 
+  if (!gpu_blacklist_.get() || !gpu_blacklist_->needs_more_info())
+    command_line->AppendSwitch(switches::kSkipGpuFullInfoCollection);
+
   if (!swiftshader_path.empty())
     command_line->AppendSwitchPath(switches::kSwiftShaderPath,
                                    swiftshader_path);