Fix DirectX diagnostic collection for about:gpu page.

content/gpu/gpu_child_thread.cc

Index: content/gpu/gpu_child_thread.cc
===================================================================
--- content/gpu/gpu_child_thread.cc	(revision 118516)
+++ content/gpu/gpu_child_thread.cc	(working copy)
@@ -10,7 +10,6 @@
 #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"
@@ -217,13 +216,14 @@
 // 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;
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kDisableGpuSandbox)) {
+    content::DxDiagNode node;
+    gpu_info_collector::GetDxDiagnostics(&node);
 
-  content::DxDiagNode node;
-  gpu_info_collector::GetDxDiagnostics(&node);
-
-  thread->message_loop()->PostTask(
-      FROM_HERE, base::Bind(&GpuChildThread::SetDxDiagnostics, thread, node));
+    thread->message_loop()->PostTask(
+        FROM_HERE, base::Bind(&GpuChildThread::SetDxDiagnostics, thread, node));
+  }
 }
 
 // Runs on the main thread.