Cleanup histogram classes mixing SetFlags into FactoryGet arguments...

chrome/browser/diagnostics/sqlite_diagnostics.cc

 // Copyright (c) 2009 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/diagnostics/sqlite_diagnostics.h"
 
 #include "app/sql/connection.h"
 #include "base/histogram.h"
 #include "base/logging.h"
 #include "base/singleton.h"
@@ skipping 25 matching lines @@
                       sql::Statement* stmt) {
     NOTREACHED() << "sqlite error " << error;
     RecordErrorInHistogram(error);
     return error;
   }
 
  private:
   static void RecordErrorInHistogram(int error) {
     // The histogram values from sqlite result codes go currently from 1 to
     // 26 currently but 50 gives them room to grow.
-    static scoped_refptr<Histogram> histogram =
-        LinearHistogram::LinearHistogramFactoryGet(kHistogramNames[unique], 1,
-                                                   50, 51);
-    histogram->SetFlags(kUmaTargetedHistogramFlag);
-    histogram->Add(error);
+    UMA_HISTOGRAM_ENUMERATION(kHistogramNames[unique], error, 50);
   }
 };
 
 }  // namespace
 
 sql::ErrorDelegate* GetErrorHandlerForCookieDb() {
   return new BasicSqliteErrrorHandler<0>();
 }
 
 sql::ErrorDelegate* GetErrorHandlerForHistoryDb() {
   return new BasicSqliteErrrorHandler<1>();
 }
 
 sql::ErrorDelegate* GetErrorHandlerForThumbnailDb() {
   return new BasicSqliteErrrorHandler<2>();
 }
 
 sql::ErrorDelegate* GetErrorHandlerForTextDb() {
   return new BasicSqliteErrrorHandler<3>();
 }
 
 sql::ErrorDelegate* GetErrorHandlerForWebDb() {
   return new BasicSqliteErrrorHandler<4>();
 }