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

net/http2/http2_structures_test.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 "net/http2/http2_structures.h"
 
 // Tests are focused on Http2FrameHeader because it has by far the most
 // methods of any of the structures.
 // Note that EXPECT.*DEATH tests are slow (a fork is probably involved).
 
 // And in case you're wondering, yes, these are ridiculously thorough tests,
 // but believe it or not, I've found stupid bugs this way.
 
 #include <memory>
 #include <ostream>
 #include <sstream>
 #include <tuple>
 #include <type_traits>
 #include <vector>
 
-#include "base/template_util.h"
 #include "net/http2/http2_structures_test_util.h"
 #include "net/http2/tools/failure.h"
 #include "net/http2/tools/http2_random.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::AssertionResult;
 using ::testing::AssertionSuccess;
 using ::testing::Combine;
 using ::testing::EndsWith;
 using ::testing::HasSubstr;
 using ::testing::MatchesRegex;
 using ::testing::Not;
 using ::testing::Values;
 using ::testing::ValuesIn;
 using std::string;
 
 namespace net {
 namespace test {
 namespace {
 
 template <typename E>
 E IncrementEnum(E e) {
-  typedef typename base::underlying_type<E>::type I;
+  using I = typename std::underlying_type<E>::type;
   return static_cast<E>(1 + static_cast<I>(e));
 }
 
 #if GTEST_HAS_DEATH_TEST && !defined(NDEBUG)
 std::vector<Http2FrameType> ValidFrameTypes() {
   std::vector<Http2FrameType> valid_types{Http2FrameType::DATA};
   while (valid_types.back() != Http2FrameType::ALTSVC) {
     valid_types.push_back(IncrementEnum(valid_types.back()));
   }
   return valid_types;
@@ skipping 427 matching lines @@
   EXPECT_EQ(w, w);
   EXPECT_NE(v, w);
 
   v.origin_length = w.origin_length;
   EXPECT_EQ(v, w);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net