Cleanup histogram classes mixing SetFlags into FactoryGet arguments...

chrome/browser/safe_browsing/safe_browsing_blocking_page.cc

 // Copyright (c) 2006-2008 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.
 //
 // Implementation of the SafeBrowsingBlockingPage class.
 
 #include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 48 matching lines @@
 static const char* const kLearnMoreCommand = "learnMore";
 static const char* const kProceedCommand = "proceed";
 static const char* const kTakeMeBackCommand = "takeMeBack";
 
 namespace {
 
 enum SafeBrowsingBlockingPageEvent {
   SHOW,
   PROCEED,
   DONT_PROCEED,
+  UNUSED_ENUM,
 };
 
 void RecordSafeBrowsingBlockingPageStats(SafeBrowsingBlockingPageEvent event) {
-  static scoped_refptr<Histogram> histogram =
-      LinearHistogram::LinearHistogramFactoryGet("interstial.safe_browsing",
-                                                 1, 2, 3);
-  histogram->SetFlags(kUmaTargetedHistogramFlag);
-  histogram->Add(event);
+  UMA_HISTOGRAM_ENUMERATION("interstial.safe_browsing", event, UNUSED_ENUM);
 }
 
 }  // namespace
 // static
 SafeBrowsingBlockingPageFactory* SafeBrowsingBlockingPage::factory_ = NULL;
 
 // The default SafeBrowsingBlockingPageFactory.  Global, made a singleton so we
 // don't leak it.
 class SafeBrowsingBlockingPageFactoryImpl
     : public SafeBrowsingBlockingPageFactory {
@@ skipping 411 matching lines @@
   UnsafeResourceMap* unsafe_resource_map = GetUnsafeResourcesMap();
   (*unsafe_resource_map)[tab_contents].push_back(unsafe_resource);
 }
 
 // static
 bool SafeBrowsingBlockingPage::IsMainPage(
     const UnsafeResourceList& unsafe_resources) {
   return unsafe_resources.size() == 1 &&
          unsafe_resources[0].resource_type == ResourceType::MAIN_FRAME;
 }