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

chrome/browser/enumerate_modules_model_win.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 "chrome/browser/enumerate_modules_model_win.h"
 
 #include <Tlhelp32.h>
 #include <wintrust.h>
 
 #include "app/l10n_util.h"
@@ skipping 327 matching lines @@
 }
 
 void ModuleEnumerator::ScanImpl() {
   base::TimeTicks start_time = base::TimeTicks::Now();
 
   enumerated_modules_->clear();
 
   // 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();
 
   std::sort(enumerated_modules_->begin(),
             enumerated_modules_->end(), ModuleSort);
 
   if (!limited_mode_) {
     // Send a reply back on the UI thread.
     BrowserThread::PostTask(
         callback_thread_id_, FROM_HERE,
         NewRunnableMethod(this, &ModuleEnumerator::ReportBack));
   } else {
     // We are on the main thread already.
     ReportBack();
   }
 
-  HISTOGRAM_TIMES("Conflicts.EnumerationTotalTime",
-                  base::TimeTicks::Now() - start_time);
+  UMA_HISTOGRAM_TIMES("Conflicts.EnumerationTotalTime",
+                      base::TimeTicks::Now() - start_time);
 }
 
 void ModuleEnumerator::EnumerateLoadedModules() {
   // Get all modules in the current process.
   ScopedHandle snap(::CreateToolhelp32Snapshot(TH32CS_SNAPMODULE,
                     ::GetCurrentProcessId()));
   if (!snap.Get())
     return;
 
   // Walk the module list.
@@ skipping 437 matching lines @@
     module != enumerated_modules_.end(); ++module) {
       if (module->status == ModuleEnumerator::CONFIRMED_BAD)
         ++confirmed_bad_modules_detected_;
       if (module->status == ModuleEnumerator::SUSPECTED_BAD)
         ++suspected_bad_modules_detected_;
   }
 
   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_)
     return;
 
   NotificationService::current()->Notify(
       NotificationType::MODULE_LIST_ENUMERATED,
       Source<EnumerateModulesModel>(this),
       NotificationService::NoDetails());
 
@@ skipping 23 matching lines @@
   GenerateHash(WideToUTF8(module.name), &filename);
   GenerateHash(WideToUTF8(module.location), &location);
   GenerateHash(WideToUTF8(module.description), &description);
   GenerateHash(WideToUTF8(module.digital_signer), &signer);
 
   string16 url = l10n_util::GetStringFUTF16(IDS_HELP_CENTER_VIEW_CONFLICTS,
       ASCIIToUTF16(filename), ASCIIToUTF16(location),
       ASCIIToUTF16(description), ASCIIToUTF16(signer));
   return GURL(UTF16ToUTF8(url));
 }