Attempt to reland r173248,173259

content/gpu/gpu_main.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 <stdlib.h>
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
@@ skipping 163 matching lines @@
   base::WaitableEvent dxva_initialized(true, false);
   DXVAVideoDecodeAccelerator::PreSandboxInitialization(
       base::Bind(&base::WaitableEvent::Signal,
                  base::Unretained(&dxva_initialized)));
 #endif
 
   // We need to track that information for the WarmUpSandbox function.
   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
         gpu_info.driver_vendor == "NVIDIA") {
       base::ThreadRestrictions::AssertIOAllowed();
       if (access("/dev/nvidiactl", R_OK) != 0) {
         VLOG(1) << "NVIDIA device file /dev/nvidiactl access denied";
         gpu_info.gpu_accessible = false;
         dead_on_arrival = true;
       }
@@ skipping 156 matching lines @@
 
 #if defined(OS_WIN)
   // Preload these DLL because the sandbox prevents them from loading.
   LoadLibrary(L"setupapi.dll");
 #endif
 }
 
 }  // namespace.
 
 }  // namespace content