Make sure the histogram counters for about:conflicts get uploaded.

BUG=51105
TEST=None

Review URL: http://codereview.chromium.org/6098009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70860 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 18 insertions, 16 deletions

diff --git a/chrome/browser/enumerate_modules_model_win.cc b/chrome/browser/enumerate_modules_model_win.cc
index f7f7f99..d59ec5a 100644
--- a/chrome/browser/enumerate_modules_model_win.cc
+++ b/chrome/browser/enumerate_modules_model_win.cc
@@ -345,23 +345,25 @@ void ModuleEnumerator::ScanImpl() {
   // Make sure the path mapping vector is setup so we can collapse paths.
   PreparePathMappings();
 
-  base::TimeTicks checkpoint = base::TimeTicks::Now();
-
   // Enumerating loaded modules must happen first since the other types of
   // modules check for duplication against the loaded modules.
+  base::TimeTicks checkpoint = base::TimeTicks::Now();
   EnumerateLoadedModules();
-  HISTOGRAM_TIMES("Conflicts.EnumerateLoadedModules",
-                  base::TimeTicks::Now() - checkpoint);
+  base::TimeTicks checkpoint2 = base::TimeTicks::Now();
+  UMA_HISTOGRAM_TIMES("Conflicts.EnumerateLoadedModules",
+                      checkpoint2 - checkpoint);
 
-  checkpoint = base::TimeTicks::Now();
+  checkpoint = checkpoint2;
   EnumerateShellExtensions();
-  HISTOGRAM_TIMES("Conflicts.EnumerateShellExtensions",
-                  base::TimeTicks::Now() - checkpoint);
+  checkpoint2 = base::TimeTicks::Now();
+  UMA_HISTOGRAM_TIMES("Conflicts.EnumerateShellExtensions",
+                      checkpoint2 - checkpoint);
 
-  checkpoint = base::TimeTicks::Now();
+  checkpoint = checkpoint2;
   EnumerateWinsockModules();
-  HISTOGRAM_TIMES("Conflicts.EnumerateWinsockModules",
-                  base::TimeTicks::Now() - checkpoint);
+  checkpoint2 = base::TimeTicks::Now();
+  UMA_HISTOGRAM_TIMES("Conflicts.EnumerateWinsockModules",
+                      checkpoint2 - checkpoint);
 
   MatchAgainstBlacklist();
 
@@ -378,8 +380,8 @@ void ModuleEnumerator::ScanImpl() {
     ReportBack();
   }
 
-  HISTOGRAM_TIMES("Conflicts.EnumerationTotalTime",
-                  base::TimeTicks::Now() - start_time);
+  UMA_HISTOGRAM_TIMES("Conflicts.EnumerationTotalTime",
+                      base::TimeTicks::Now() - start_time);
 }
 
 void ModuleEnumerator::EnumerateLoadedModules() {
@@ -837,10 +839,10 @@ void EnumerateModulesModel::DoneScanning() {
   scanning_ = false;
   lock->Release();
 
-  HISTOGRAM_COUNTS_100("Conflicts.SuspectedBadModules",
-                       suspected_bad_modules_detected_);
-  HISTOGRAM_COUNTS_100("Conflicts.ConfirmedBadModules",
-                       confirmed_bad_modules_detected_);
+  UMA_HISTOGRAM_COUNTS_100("Conflicts.SuspectedBadModules",
+                           suspected_bad_modules_detected_);
+  UMA_HISTOGRAM_COUNTS_100("Conflicts.ConfirmedBadModules",
+                           confirmed_bad_modules_detected_);
 
   // Notifications are not available in limited mode.
   if (limited_mode_)