Fix WinSAT histograms.

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"
 
 #include <windows.h>
 #include <d3d9.h>
 #include <setupapi.h>
 
@@ skipping 40 matching lines @@
 }
 
 content::GpuPerformanceStats RetrieveGpuPerformanceStats() {
   TRACE_EVENT0("gpu", "RetrieveGpuPerformanceStats");
 
   // If the user re-runs the assessment without restarting, the COM API
   // returns WINSAT_ASSESSMENT_STATE_NOT_AVAILABLE. Because of that and
   // http://crbug.com/124325, read the assessment result files directly.
   content::GpuPerformanceStats stats;
 
-  base::TimeTicks start_time = base::TimeTicks::Now();
-
   // Get path to WinSAT results files.
   wchar_t winsat_results_path[MAX_PATH];
   DWORD size = ExpandEnvironmentStrings(
       L"%WinDir%\\Performance\\WinSAT\\DataStore\\",
       winsat_results_path, MAX_PATH);
   if (size == 0 || size > MAX_PATH) {
     LOG(ERROR) << "The path to the WinSAT results is too long: "
                << size << " chars.";
     return stats;
   }
@@ skipping 56 matching lines @@
       stats.gaming = ReadXMLFloatValue(&reader);
   }
 
   if (stats.overall == 0.0)
     LOG(ERROR) << "Could not read overall score from assessment results.";
   if (stats.graphics == 0.0)
     LOG(ERROR) << "Could not read graphics score from assessment results.";
   if (stats.gaming == 0.0)
     LOG(ERROR) << "Could not read gaming score from assessment results.";
 
+  return stats;
+}
+
+content::GpuPerformanceStats RetrieveGpuPerformanceStatsWithHistograms() {
+  base::TimeTicks start_time = base::TimeTicks::Now();
+
+  content::GpuPerformanceStats stats = RetrieveGpuPerformanceStats();
+
+  UMA_HISTOGRAM_TIMES("GPU.WinSAT.ReadResultsFileTime",
+                      base::TimeTicks::Now() - start_time);
   UMA_HISTOGRAM_CUSTOM_COUNTS("GPU.WinSAT.OverallScore2",
                               stats.overall * 10, 10, 200, 50);
   UMA_HISTOGRAM_CUSTOM_COUNTS("GPU.WinSAT.GraphicsScore2",
                               stats.graphics * 10, 10, 200, 50);
   UMA_HISTOGRAM_CUSTOM_COUNTS("GPU.WinSAT.GamingScore2",
                               stats.gaming * 10, 10, 200, 50);
-
-  UMA_HISTOGRAM_TIMES("GPU.WinSAT.ReadResultsFileTime",
-                      base::TimeTicks::Now() - start_time);
+  UMA_HISTOGRAM_BOOLEAN(
+      "GPU.WinSAT.HasResults",
+      stats.overall != 0.0 && stats.graphics != 0.0 && stats.gaming != 0.0);
 
   return stats;
 }
 
 }  // namespace anonymous
 
 namespace gpu_info_collector {
 
 #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
 
 bool CollectGraphicsInfo(content::GPUInfo* gpu_info) {
   TRACE_EVENT0("gpu", "CollectGraphicsInfo");
 
   DCHECK(gpu_info);
 
-  content::GpuPerformanceStats stats = RetrieveGpuPerformanceStats();
-  UMA_HISTOGRAM_BOOLEAN(
-      "GPU.WinSAT.HasResults",
-      stats.overall != 0.0 && stats.graphics != 0.0 && stats.gaming != 0.0);
-  gpu_info->performance_stats = stats;
+  gpu_info->performance_stats = RetrieveGpuPerformanceStats();
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseGL)) {
     std::string requested_implementation_name =
         CommandLine::ForCurrentProcess()->GetSwitchValueASCII(switches::kUseGL);
     if (requested_implementation_name == "swiftshader") {
       gpu_info->software_rendering = true;
       return false;
     }
   }
 
@@ skipping 34 matching lines @@
 
 bool CollectPreliminaryGraphicsInfo(content::GPUInfo* gpu_info) {
   TRACE_EVENT0("gpu", "CollectPreliminaryGraphicsInfo");
 
   DCHECK(gpu_info);
 
   bool rt = true;
   if (!CollectVideoCardInfo(gpu_info))
     rt = false;
 
-  gpu_info->performance_stats = RetrieveGpuPerformanceStats();
+  gpu_info->performance_stats = RetrieveGpuPerformanceStatsWithHistograms();
 
   return rt;
 }
 
 bool CollectGraphicsInfoD3D(IDirect3D9* d3d, content::GPUInfo* gpu_info) {
   TRACE_EVENT0("gpu", "CollectGraphicsInfoD3D");
 
   DCHECK(d3d);
   DCHECK(gpu_info);
 
@@ skipping 147 matching lines @@
 
   size_t pos = gl_version_string.find_last_not_of("0123456789.");
   if (pos != std::string::npos && pos < gl_version_string.length() - 1) {
     gpu_info->driver_version = gl_version_string.substr(pos + 1);
     return true;
   }
   return false;
 }
 
 }  // namespace gpu_info_collector