Fix DirectX diagnostic collection for about:gpu page.

content/gpu/gpu_child_thread.cc

 // Copyright (c) 2011 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_child_thread.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/threading/worker_pool.h"
-#include "base/win/scoped_com_initializer.h"
 #include "build/build_config.h"
 #include "content/common/child_process.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/gpu/gpu_info_collector.h"
 #include "content/gpu/gpu_watchdog_thread.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ui/gfx/gl/gl_implementation.h"
 
@@ skipping 142 matching lines @@
     watchdog_thread_->Stop();
   }
 }
 
 void GpuChildThread::OnCollectGraphicsInfo() {
 #if defined(OS_WIN)
   if (!gpu_info_.finalized && !collecting_dx_diagnostics_) {
     // Prevent concurrent collection of DirectX diagnostics.
     collecting_dx_diagnostics_ = true;
 
-    // Asynchronously collect the DirectX diagnostics because this can take a
-    // couple of seconds.
-    if (!base::WorkerPool::PostTask(
-        FROM_HERE, base::Bind(&GpuChildThread::CollectDxDiagnostics, this),
-        true)) {
-      // Flag GPU info as complete if the DirectX diagnostics cannot be
-      // collected.
-      collecting_dx_diagnostics_ = false;
-      gpu_info_.finalized = true;
-    } else {
-      // Do not send response if we are still completing the GPUInfo struct
-      return;
+    if (CommandLine::ForCurrentProcess()->HasSwitch(
+        switches::kDisableGpuSandbox)) {
+      // Asynchronously collect the DirectX diagnostics because this can take a
+      // couple of seconds.
+      if (!base::WorkerPool::PostTask(
+          FROM_HERE, base::Bind(&GpuChildThread::CollectDxDiagnostics, this),
+          true)) {
+        // Flag GPU info as complete if the DirectX diagnostics cannot be
+        // collected.
+        collecting_dx_diagnostics_ = false;
+        gpu_info_.finalized = true;
+      } else {
+        // Do not send response if we are still completing the GPUInfo struct
+        return;
+      }
     }
   }
 #endif
   Send(new GpuHostMsg_GraphicsInfoCollected(gpu_info_));
 }
 
 void GpuChildThread::OnClean() {
   LOG(INFO) << "GPU: Removing all contexts";
   if (gpu_channel_manager_.get())
     gpu_channel_manager_->LoseAllContexts();
@@ skipping 12 matching lines @@
     // Do not sleep here. The GPU watchdog timer tracks the amount of user
     // time this thread is using and it doesn't use much while calling Sleep.
   }
 }
 
 #if defined(OS_WIN)
 
 // Runs on a worker thread. The GPU process never terminates voluntarily so
 // it is safe to assume that its message loop is valid.
 void GpuChildThread::CollectDxDiagnostics(GpuChildThread* thread) {
-  base::win::ScopedCOMInitializer com_initializer;
-
   content::DxDiagNode node;
   gpu_info_collector::GetDxDiagnostics(&node);
 
   thread->message_loop()->PostTask(
       FROM_HERE, base::Bind(&GpuChildThread::SetDxDiagnostics, thread, node));
 }
 
 // Runs on the main thread.
 void GpuChildThread::SetDxDiagnostics(GpuChildThread* thread,
                                       const content::DxDiagNode& node) {
   thread->gpu_info_.dx_diagnostics = node;
   thread->gpu_info_.finalized = true;
   thread->collecting_dx_diagnostics_ = false;
   thread->Send(new GpuHostMsg_GraphicsInfoCollected(thread->gpu_info_));
 }
 
 #endif