Windows: Only collect D3D11 UMA stats if the GPU process launches and initializes successfully.

content/gpu/gpu_info_collector_win.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 "content/gpu/gpu_info_collector.h"
 
 // This has to be included before windows.h.
 #include "third_party/re2/re2/re2.h"
 
 #include <windows.h>
@@ skipping 181 matching lines @@
 #if !defined(GOOGLE_CHROME_BUILD)
 AMDVideoCardType GetAMDVideocardType() {
   return UNKNOWN;
 }
 #else
 // This function has a real implementation for official builds that can
 // be found in src/third_party/amd.
 AMDVideoCardType GetAMDVideocardType();
 #endif
 
-// Collects information about the level of D3D11 support and records it in
-// the UMA stats. Records no stats when D3D11 in not supported at all.
-//
-// http://crbug.com/175525. Using D3D11 seems to crash when dlumd32.dll is
-// loaded. This function is not currently called.
-void CollectD3D11Support(HMODULE d3d11_module) {
-  TRACE_EVENT0("gpu", "CollectD3D11Support");
-
+void CollectD3D11Support() {
   typedef HRESULT (WINAPI *D3D11CreateDeviceFunc)(
       IDXGIAdapter* adapter,
       D3D_DRIVER_TYPE driver_type,
       HMODULE software,
       UINT flags,
       const D3D_FEATURE_LEVEL* feature_levels,
       UINT num_feature_levels,
       UINT sdk_version,
       ID3D11Device** device,
       D3D_FEATURE_LEVEL* feature_level,
       ID3D11DeviceContext** immediate_context);
 
   // This enumeration must be kept in sync with histograms.xml. Do not reorder
   // the members; always add to the end.
   enum FeatureLevel {
     FEATURE_LEVEL_UNKNOWN,
     FEATURE_LEVEL_NO_D3D11_DLL,
     FEATURE_LEVEL_NO_CREATE_DEVICE_ENTRY_POINT,
     FEATURE_LEVEL_DEVICE_CREATION_FAILED,
     FEATURE_LEVEL_9_1,
     FEATURE_LEVEL_9_2,
     FEATURE_LEVEL_9_3,
     FEATURE_LEVEL_10_0,
     FEATURE_LEVEL_10_1,
     FEATURE_LEVEL_11_0,
     NUM_FEATURE_LEVELS
   };
 
+  TRACE_EVENT0("gpu", "CollectD3D11Support");
+
+  // Windows XP is expected to not support D3D11.
+  if (base::win::GetVersion() <= base::win::VERSION_XP)
+    return;
+
   FeatureLevel feature_level = FEATURE_LEVEL_UNKNOWN;
   UINT bgra_support = 0;
 
+  // This is leaked in case it is hooked by a third party DLL.
+  base::NativeLibrary d3d11_module = base::LoadNativeLibrary(
+      base::FilePath(L"d3d11.dll"),
+      NULL);
+
   if (!d3d11_module) {
     feature_level = FEATURE_LEVEL_NO_D3D11_DLL;
   } else {
     D3D11CreateDeviceFunc create_func =
         reinterpret_cast<D3D11CreateDeviceFunc>(
-            GetProcAddress(d3d11_module, "D3D11CreateDevice"));
+            base::GetFunctionPointerFromNativeLibrary(d3d11_module,
+                                                      "D3D11CreateDevice"));
     if (!create_func) {
       feature_level = FEATURE_LEVEL_NO_CREATE_DEVICE_ENTRY_POINT;
     } else {
       static const D3D_FEATURE_LEVEL d3d_feature_levels[] = {
         D3D_FEATURE_LEVEL_11_0,
         D3D_FEATURE_LEVEL_10_1,
         D3D_FEATURE_LEVEL_10_0,
         D3D_FEATURE_LEVEL_9_3,
         D3D_FEATURE_LEVEL_9_2,
         D3D_FEATURE_LEVEL_9_1
@@ skipping 56 matching lines @@
     return;
 
   UMA_HISTOGRAM_BOOLEAN(
       "GPU.D3D11_B8G8R8A8_Texture2DSupport",
       (bgra_support & D3D11_FORMAT_SUPPORT_TEXTURE2D) != 0);
   UMA_HISTOGRAM_BOOLEAN(
       "GPU.D3D11_B8G8R8A8_RenderTargetSupport",
       (bgra_support & D3D11_FORMAT_SUPPORT_RENDER_TARGET) != 0);
 }
 
-void CollectD3D11SupportDelayed(
-    const scoped_refptr<base::MessageLoopProxy> main_loop) {
-  // Windows XP is expected to not support D3D11.
-  if (base::win::GetVersion() <= base::win::VERSION_XP)
-    return;
-
-  // This is leaked in case it is hooked by a third party DLL.
-  HMODULE d3d11_module = LoadLibrary(L"d3d11.dll");
-
-  // Collect the D3D11 stats after a delay to allow third party DLLs
-  // to hook D3D11 before we try to use it. Also do it on the main thread
-  // in case the third party DLL does this on the main thread.
-  main_loop->PostDelayedTask(
-      FROM_HERE,
-      base::Bind(CollectD3D11Support, d3d11_module),
-      base::TimeDelta::FromSeconds(10));
-}
-
 bool CollectDriverInfoD3D(const std::wstring& device_id,
                           content::GPUInfo* gpu_info) {
   TRACE_EVENT0("gpu", "CollectDriverInfoD3D");
 
   // create device info for the display device
   HDEVINFO device_info = SetupDiGetClassDevsW(
       NULL, device_id.c_str(), NULL,
       DIGCF_PRESENT | DIGCF_PROFILE | DIGCF_ALLCLASSES);
   if (device_info == INVALID_HANDLE_VALUE) {
     LOG(ERROR) << "Creating device info failed";
@@ skipping 226 matching lines @@
     basic_gpu_info->software_rendering = true;
     return;
   }
 
   MergeGPUInfoGL(basic_gpu_info, context_gpu_info);
 
   basic_gpu_info->dx_diagnostics = context_gpu_info.dx_diagnostics;
 }
 
 }  // namespace gpu_info_collector