Migrate more files to histogram_macros.h from histogram.h.

components/navigation_metrics/navigation_metrics.cc

 // Copyright 2013 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 "components/navigation_metrics/navigation_metrics.h"
 
 #include "base/macros.h"
-#include "base/metrics/histogram.h"
+#include "base/metrics/histogram_macros.h"
 #include "url/gurl.h"
 
 namespace {
 
 // This enum is used in building the histogram. So, this is append only,
 // any new scheme should be added at the end, before SCHEME_MAX
 enum Scheme {
   SCHEME_UNKNOWN,
   SCHEME_HTTP,
   SCHEME_HTTPS,
@@ skipping 51 matching lines @@
   }
 
   UMA_HISTOGRAM_ENUMERATION("Navigation.MainFrameScheme", scheme, SCHEME_MAX);
   if (!is_in_page) {
     UMA_HISTOGRAM_ENUMERATION("Navigation.MainFrameSchemeDifferentPage", scheme,
                               SCHEME_MAX);
   }
 }
 
 }  // namespace navigation_metrics