Attempt to reland r173248,173259

content/gpu/gpu_main.cc

Index: content/gpu/gpu_main.cc
===================================================================
--- content/gpu/gpu_main.cc	(revision 173496)
+++ content/gpu/gpu_main.cc	(working copy)
@@ -181,14 +181,12 @@
   bool initialized_gl_context = false;
   // Load and initialize the GL implementation and locate the GL entry points.
   if (gfx::GLSurface::InitializeOneOff()) {
-    if (!command_line.HasSwitch(switches::kSkipGpuFullInfoCollection)) {
-      if (!gpu_info_collector::CollectGraphicsInfo(&gpu_info))
-        VLOG(1) << "gpu_info_collector::CollectGraphicsInfo failed";
-      GetContentClient()->SetGpuInfo(gpu_info);
+    if (!gpu_info_collector::CollectContextGraphicsInfo(&gpu_info))
+      VLOG(1) << "gpu_info_collector::CollectGraphicsInfo failed";
+    GetContentClient()->SetGpuInfo(gpu_info);
 
-      // We know that CollectGraphicsInfo will initialize a GLContext.
-      initialized_gl_context = true;
-    }
+    // We know that CollectGraphicsInfo will initialize a GLContext.
+    initialized_gl_context = true;
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
     if (gpu_info.gpu.vendor_id == 0x10de &&  // NVIDIA