Remove base::underlying_type, replace uses with std::underlying_type

components/ntp_snippets/content_suggestions_metrics.cc

 // Copyright 2016 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/ntp_snippets/content_suggestions_metrics.h"
 
 #include <cmath>
 #include <string>
 #include <type_traits>
 
 #include "base/metrics/histogram.h"
 #include "base/metrics/histogram_functions.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/user_metrics.h"
 #include "base/strings/stringprintf.h"
-#include "base/template_util.h"
 
 namespace ntp_snippets {
 namespace metrics {
 
 namespace {
 
 const int kMaxSuggestionsPerCategory = 10;
 const int kMaxSuggestionsTotal = 50;
 const int kMaxCategories = 10;
 
@@ skipping 49 matching lines @@
   PHYSICAL_WEB_PAGES,
   FOREIGN_TABS,
   ARTICLES,
   READING_LIST,
   // Insert new values here!
   COUNT
 };
 
 HistogramCategories GetHistogramCategory(Category category) {
   static_assert(
-      std::is_same<decltype(category.id()), typename base::underlying_type<
-                                                KnownCategories>::type>::value,
+      std::is_same<decltype(category.id()),
+                   typename std::underlying_type<KnownCategories>::type>::value,
       "KnownCategories must have the same underlying type as category.id()");
   // Note: Since the underlying type of KnownCategories is int, it's legal to
   // cast from int to KnownCategories, even if the given value isn't listed in
   // the enumeration. The switch still makes sure that all known values are
   // listed here.
   auto known_category = static_cast<KnownCategories>(category.id());
   switch (known_category) {
     case KnownCategories::RECENT_TABS:
       return HistogramCategories::RECENT_TABS;
     case KnownCategories::DOWNLOADS:
@@ skipping 259 matching lines @@
 }
 
 void OnCategoryDismissed(Category category) {
   UMA_HISTOGRAM_ENUMERATION(kHistogramCategoryDismissed,
                             GetHistogramCategory(category),
                             HistogramCategories::COUNT);
 }
 
 }  // namespace metrics
 }  // namespace ntp_snippets