diff --git a/http2/adapter/nghttp2_adapter_test.cc b/http2/adapter/nghttp2_adapter_test.cc
index e72727c..5825fdf 100644
--- a/http2/adapter/nghttp2_adapter_test.cc
+++ b/http2/adapter/nghttp2_adapter_test.cc
@@ -17,6 +17,7 @@
 
 using ConnectionError = Http2VisitorInterface::ConnectionError;
 
+using spdy::SpdyFrameType;
 using testing::_;
 
 enum FrameType {
@@ -100,8 +101,8 @@
   result = adapter->Send();
   // Some bytes should have been serialized.
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::PING}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::PING}));
   visitor.Clear();
 
   const std::vector<Header> headers1 =
@@ -151,9 +152,9 @@
 
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::HEADERS,
-                                            spdy::SpdyFrameType::HEADERS,
-                                            spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::HEADERS, SpdyFrameType::HEADERS,
+                            SpdyFrameType::HEADERS}));
   visitor.Clear();
 
   // All streams are active and have not yet received any data, so the receive
@@ -322,8 +323,8 @@
   EXPECT_TRUE(adapter->want_write());
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS,
+                                            SpdyFrameType::RST_STREAM}));
 }
 
 TEST(NgHttp2AdapterTest, ClientRejects100HeadersWithContent) {
@@ -382,8 +383,8 @@
   EXPECT_TRUE(adapter->want_write());
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS,
+                                            SpdyFrameType::RST_STREAM}));
 }
 
 TEST(NgHttp2AdapterTest, ClientRejects100HeadersWithContentLength) {
@@ -451,8 +452,8 @@
   EXPECT_TRUE(adapter->want_write());
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS,
+                                            SpdyFrameType::RST_STREAM}));
 }
 
 TEST(NgHttp2AdapterTest, ClientHandles204WithContent) {
@@ -515,8 +516,8 @@
   EXPECT_TRUE(adapter->want_write());
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS,
+                                            SpdyFrameType::RST_STREAM}));
 }
 
 TEST(NgHttp2AdapterTest, ClientHandles304WithContent) {
@@ -576,8 +577,8 @@
   EXPECT_TRUE(adapter->want_write());
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS,
+                                            SpdyFrameType::RST_STREAM}));
 }
 
 TEST(NgHttp2AdapterTest, ClientHandles304WithContentLength) {
@@ -631,7 +632,7 @@
   EXPECT_TRUE(adapter->want_write());
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS}));
 }
 
 TEST(NgHttp2AdapterTest, ClientHandlesTrailers) {
@@ -660,7 +661,7 @@
   absl::string_view data = visitor.data();
   EXPECT_THAT(data, testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
   data.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-  EXPECT_THAT(data, EqualsFrames({spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(data, EqualsFrames({SpdyFrameType::HEADERS}));
   visitor.Clear();
 
   const std::string stream_frames =
@@ -707,7 +708,7 @@
   EXPECT_TRUE(adapter->want_write());
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS}));
 }
 
 TEST(NgHttp2AdapterTest, ClientSendsTrailers) {
@@ -741,8 +742,8 @@
   absl::string_view data = visitor.data();
   EXPECT_THAT(data, testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
   data.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-  EXPECT_THAT(data, EqualsFrames({spdy::SpdyFrameType::HEADERS,
-                                  spdy::SpdyFrameType::DATA}));
+  EXPECT_THAT(data,
+              EqualsFrames({SpdyFrameType::HEADERS, SpdyFrameType::DATA}));
   visitor.Clear();
 
   const std::vector<Header> trailers1 =
@@ -755,7 +756,7 @@
   result = adapter->Send();
   EXPECT_EQ(0, result);
   data = visitor.data();
-  EXPECT_THAT(data, EqualsFrames({spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(data, EqualsFrames({SpdyFrameType::HEADERS}));
 }
 
 TEST(NgHttp2AdapterTest, ClientHandlesMetadata) {
@@ -784,7 +785,7 @@
   absl::string_view data = visitor.data();
   EXPECT_THAT(data, testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
   data.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-  EXPECT_THAT(data, EqualsFrames({spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(data, EqualsFrames({SpdyFrameType::HEADERS}));
   visitor.Clear();
 
   const std::string stream_frames =
@@ -835,7 +836,7 @@
   EXPECT_TRUE(adapter->want_write());
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS}));
 }
 
 TEST(NgHttp2AdapterTest, ClientHandlesMetadataWithEmptyPayload) {
@@ -861,7 +862,7 @@
   absl::string_view data = visitor.data();
   EXPECT_THAT(data, testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
   data.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-  EXPECT_THAT(data, EqualsFrames({spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(data, EqualsFrames({SpdyFrameType::HEADERS}));
   visitor.Clear();
 
   const std::string stream_frames =
@@ -970,7 +971,7 @@
   EXPECT_TRUE(adapter->want_read());  // Even after an error. Why?
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS}));
 }
 
 TEST(NgHttp2AdapterTest, ClientHandlesHpackHeaderTableSetting) {
@@ -1043,7 +1044,7 @@
   absl::string_view data = visitor.data();
   EXPECT_THAT(data, testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
   data.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-  EXPECT_THAT(data, EqualsFrames({spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(data, EqualsFrames({SpdyFrameType::HEADERS}));
   visitor.Clear();
 
   const std::string stream_frames =
@@ -1099,8 +1100,8 @@
   EXPECT_TRUE(adapter->want_write());
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS,
+                                            SpdyFrameType::RST_STREAM}));
 }
 
 TEST(NgHttp2AdapterTest, ClientRstStreamWhileHandlingHeaders) {
@@ -1129,7 +1130,7 @@
   absl::string_view data = visitor.data();
   EXPECT_THAT(data, testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
   data.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-  EXPECT_THAT(data, EqualsFrames({spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(data, EqualsFrames({SpdyFrameType::HEADERS}));
   visitor.Clear();
 
   const std::string stream_frames =
@@ -1174,8 +1175,8 @@
   EXPECT_TRUE(adapter->want_write());
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS,
+                                            SpdyFrameType::RST_STREAM}));
 }
 
 TEST(NgHttp2AdapterTest, ClientConnectionErrorWhileHandlingHeaders) {
@@ -1204,7 +1205,7 @@
   absl::string_view data = visitor.data();
   EXPECT_THAT(data, testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
   data.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-  EXPECT_THAT(data, EqualsFrames({spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(data, EqualsFrames({SpdyFrameType::HEADERS}));
   visitor.Clear();
 
   const std::string stream_frames =
@@ -1243,7 +1244,7 @@
   EXPECT_TRUE(adapter->want_write());
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS}));
 }
 
 TEST(NgHttp2AdapterTest, ClientConnectionErrorWhileHandlingHeadersOnly) {
@@ -1272,7 +1273,7 @@
   absl::string_view data = visitor.data();
   EXPECT_THAT(data, testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
   data.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-  EXPECT_THAT(data, EqualsFrames({spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(data, EqualsFrames({SpdyFrameType::HEADERS}));
   visitor.Clear();
 
   const std::string stream_frames =
@@ -1310,7 +1311,7 @@
   EXPECT_TRUE(adapter->want_write());
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS}));
 }
 
 TEST(NgHttp2AdapterTest, ClientRejectsHeaders) {
@@ -1339,7 +1340,7 @@
   absl::string_view data = visitor.data();
   EXPECT_THAT(data, testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
   data.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-  EXPECT_THAT(data, EqualsFrames({spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(data, EqualsFrames({SpdyFrameType::HEADERS}));
   visitor.Clear();
 
   const std::string stream_frames =
@@ -1373,7 +1374,7 @@
   EXPECT_TRUE(adapter->want_write());
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS}));
 }
 
 TEST(NgHttp2AdapterTest, ClientStartsShutdown) {
@@ -1418,7 +1419,7 @@
   absl::string_view data = visitor.data();
   EXPECT_THAT(data, testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
   data.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-  EXPECT_THAT(data, EqualsFrames({spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(data, EqualsFrames({SpdyFrameType::HEADERS}));
   visitor.Clear();
 
   const std::string stream_frames =
@@ -1460,7 +1461,7 @@
   EXPECT_TRUE(adapter->want_write());
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS}));
 }
 
 TEST(NgHttp2AdapterTest, ClientRejects101Response) {
@@ -1487,7 +1488,7 @@
   absl::string_view data = visitor.data();
   EXPECT_THAT(data, testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
   data.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-  EXPECT_THAT(data, EqualsFrames({spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(data, EqualsFrames({SpdyFrameType::HEADERS}));
   visitor.Clear();
 
   const std::string stream_frames =
@@ -1530,8 +1531,8 @@
   EXPECT_TRUE(adapter->want_write());
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS,
+                                            SpdyFrameType::RST_STREAM}));
 }
 
 TEST(NgHttp2AdapterTest, ClientSubmitRequest) {
@@ -1563,7 +1564,7 @@
 
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS}));
   visitor.Clear();
 
   EXPECT_EQ(0, adapter->GetHpackEncoderDynamicTableSize());
@@ -1605,8 +1606,8 @@
   // Send window for a nonexistent stream is not available.
   EXPECT_EQ(-1, adapter->GetStreamSendWindowSize(stream_id + 2));
 
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::HEADERS,
-                                            spdy::SpdyFrameType::DATA}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::HEADERS, SpdyFrameType::DATA}));
   EXPECT_THAT(visitor.data(), testing::HasSubstr(kBody));
   visitor.Clear();
   EXPECT_FALSE(adapter->want_write());
@@ -1628,7 +1629,7 @@
 
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::HEADERS}));
 
   EXPECT_EQ(kSentinel2, adapter->GetStreamUserData(stream_id));
 
@@ -1669,7 +1670,7 @@
 
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS}));
   visitor.Clear();
 
   EXPECT_FALSE(adapter->want_write());
@@ -1699,8 +1700,8 @@
 
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::HEADERS,
-                                            spdy::SpdyFrameType::DATA}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::HEADERS, SpdyFrameType::DATA}));
   EXPECT_THAT(visitor.data(), testing::HasSubstr(kBody));
   EXPECT_FALSE(adapter->want_write());
 }
@@ -1742,7 +1743,7 @@
   EXPECT_THAT(serialized,
               testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
   serialized.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-  EXPECT_THAT(serialized, EqualsFrames({spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(serialized, EqualsFrames({SpdyFrameType::HEADERS}));
   visitor.Clear();
   EXPECT_FALSE(adapter->want_write());
 
@@ -1755,7 +1756,7 @@
 
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::DATA}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::DATA}));
   EXPECT_FALSE(adapter->want_write());
 
   // Stream data is done, so this stream cannot be resumed.
@@ -1800,7 +1801,7 @@
   EXPECT_THAT(serialized,
               testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
   serialized.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-  EXPECT_THAT(serialized, EqualsFrames({spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(serialized, EqualsFrames({SpdyFrameType::HEADERS}));
   visitor.Clear();
   EXPECT_FALSE(adapter->want_write());
 
@@ -1813,7 +1814,7 @@
 
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::DATA}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::DATA}));
   EXPECT_FALSE(adapter->want_write());
 
   // Stream data is done, so this stream cannot be resumed.
@@ -1866,8 +1867,8 @@
   EXPECT_THAT(serialized,
               testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
   serialized.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-  EXPECT_THAT(serialized, EqualsFrames({spdy::SpdyFrameType::HEADERS,
-                                        spdy::SpdyFrameType::DATA}));
+  EXPECT_THAT(serialized,
+              EqualsFrames({SpdyFrameType::HEADERS, SpdyFrameType::DATA}));
   EXPECT_FALSE(adapter->want_write());
 }
 
@@ -1900,7 +1901,7 @@
 
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS}));
   visitor.Clear();
 
   // Let the client open a stream with a request.
@@ -1918,7 +1919,7 @@
 
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::HEADERS}));
   visitor.Clear();
 
   // Let the client RST_STREAM the stream it opened.
@@ -1931,7 +1932,7 @@
 
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::RST_STREAM}));
   visitor.Clear();
 
   // Let the server send a response on the stream. (It might not have received
@@ -1975,9 +1976,8 @@
   EXPECT_THAT(serialized,
               testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
   serialized.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-  EXPECT_THAT(
-      serialized,
-      EqualsFrames({static_cast<spdy::SpdyFrameType>(kMetadataFrameType)}));
+  EXPECT_THAT(serialized,
+              EqualsFrames({static_cast<SpdyFrameType>(kMetadataFrameType)}));
   EXPECT_FALSE(adapter->want_write());
 }
 
@@ -2007,12 +2007,11 @@
   EXPECT_THAT(serialized,
               testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
   serialized.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-  EXPECT_THAT(
-      serialized,
-      EqualsFrames({static_cast<spdy::SpdyFrameType>(kMetadataFrameType),
-                    static_cast<spdy::SpdyFrameType>(kMetadataFrameType),
-                    static_cast<spdy::SpdyFrameType>(kMetadataFrameType),
-                    static_cast<spdy::SpdyFrameType>(kMetadataFrameType)}));
+  EXPECT_THAT(serialized,
+              EqualsFrames({static_cast<SpdyFrameType>(kMetadataFrameType),
+                            static_cast<SpdyFrameType>(kMetadataFrameType),
+                            static_cast<SpdyFrameType>(kMetadataFrameType),
+                            static_cast<SpdyFrameType>(kMetadataFrameType)}));
   EXPECT_FALSE(adapter->want_write());
 }
 
@@ -2034,9 +2033,8 @@
   EXPECT_THAT(serialized,
               testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
   serialized.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-  EXPECT_THAT(
-      serialized,
-      EqualsFrames({static_cast<spdy::SpdyFrameType>(kMetadataFrameType)}));
+  EXPECT_THAT(serialized,
+              EqualsFrames({static_cast<SpdyFrameType>(kMetadataFrameType)}));
   EXPECT_FALSE(adapter->want_write());
 }
 
@@ -2072,7 +2070,7 @@
 
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS}));
   visitor.Clear();
 
   EXPECT_FALSE(adapter->want_write());
@@ -2096,8 +2094,8 @@
   result = adapter->Send();
   EXPECT_EQ(0, result);
 
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::HEADERS,
-                                            spdy::SpdyFrameType::DATA}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::HEADERS, SpdyFrameType::DATA}));
   EXPECT_THAT(visitor.data(), testing::HasSubstr(kBody));
   visitor.Clear();
   EXPECT_FALSE(adapter->want_write());
@@ -2152,7 +2150,7 @@
   result = adapter->Send();
   EXPECT_EQ(0, result);
 
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::HEADERS}));
   visitor.Clear();
   EXPECT_FALSE(adapter->want_write());
 }
@@ -2189,7 +2187,7 @@
   EXPECT_THAT(serialized,
               testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
   serialized.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-  EXPECT_THAT(serialized, EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(serialized, EqualsFrames({SpdyFrameType::SETTINGS}));
   visitor.Clear();
 
   const std::string kLongBody = std::string(81000, 'c');
@@ -2213,11 +2211,10 @@
 
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(
-      visitor.data(),
-      EqualsFrames({spdy::SpdyFrameType::HEADERS, spdy::SpdyFrameType::DATA,
-                    spdy::SpdyFrameType::DATA, spdy::SpdyFrameType::DATA,
-                    spdy::SpdyFrameType::DATA, spdy::SpdyFrameType::DATA}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::HEADERS, SpdyFrameType::DATA,
+                            SpdyFrameType::DATA, SpdyFrameType::DATA,
+                            SpdyFrameType::DATA, SpdyFrameType::DATA}));
 }
 
 TEST(NgHttp2AdapterTest, ClientReceivesInitialWindowSettingAfterStreamStart) {
@@ -2268,11 +2265,10 @@
 
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(
-      visitor.data(),
-      EqualsFrames({spdy::SpdyFrameType::HEADERS, spdy::SpdyFrameType::DATA,
-                    spdy::SpdyFrameType::DATA, spdy::SpdyFrameType::DATA,
-                    spdy::SpdyFrameType::DATA}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::HEADERS, SpdyFrameType::DATA,
+                            SpdyFrameType::DATA, SpdyFrameType::DATA,
+                            SpdyFrameType::DATA}));
   visitor.Clear();
 
   // Can't write any more due to flow control.
@@ -2298,8 +2294,8 @@
 
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::DATA}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::DATA}));
 }
 
 TEST(NgHttp2AdapterTest, InvalidInitialWindowSetting) {
@@ -2335,7 +2331,7 @@
   EXPECT_THAT(serialized,
               testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
   serialized.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-  EXPECT_THAT(serialized, EqualsFrames({spdy::SpdyFrameType::GOAWAY}));
+  EXPECT_THAT(serialized, EqualsFrames({SpdyFrameType::GOAWAY}));
   visitor.Clear();
 }
 
@@ -2359,7 +2355,7 @@
   absl::string_view data = visitor.data();
   EXPECT_THAT(data, testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
   data.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-  EXPECT_THAT(data, EqualsFrames({spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(data, EqualsFrames({SpdyFrameType::HEADERS}));
   visitor.Clear();
 
   const uint32_t kLargeInitialWindow = (1u << 31) - 1;
@@ -2410,9 +2406,9 @@
 
   int result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::SETTINGS,
+                            SpdyFrameType::RST_STREAM}));
 }
 
 TEST(NgHttp2AdapterTest, ClientForbidsPushPromise) {
@@ -2430,7 +2426,7 @@
   absl::string_view data = visitor.data();
   EXPECT_THAT(data, testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
   data.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-  EXPECT_THAT(data, EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(data, EqualsFrames({SpdyFrameType::SETTINGS}));
 
   visitor.Clear();
 
@@ -2445,7 +2441,7 @@
   EXPECT_CALL(visitor, OnFrameSent(HEADERS, stream_id, _, 0x5, 0));
   write_result = adapter->Send();
   EXPECT_EQ(0, write_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::HEADERS}));
   visitor.Clear();
 
   const std::vector<Header> push_headers =
@@ -2502,7 +2498,7 @@
   absl::string_view data = visitor.data();
   EXPECT_THAT(data, testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
   data.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-  EXPECT_THAT(data, EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(data, EqualsFrames({SpdyFrameType::SETTINGS}));
 
   visitor.Clear();
 
@@ -2517,7 +2513,7 @@
   EXPECT_CALL(visitor, OnFrameSent(HEADERS, stream_id, _, 0x5, 0));
   write_result = adapter->Send();
   EXPECT_EQ(0, write_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::HEADERS}));
   visitor.Clear();
 
   const std::string frames =
@@ -2800,9 +2796,9 @@
   // Some bytes should have been serialized.
   EXPECT_EQ(0, send_result);
   // SETTINGS ack, two PING acks.
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::PING,
-                                            spdy::SpdyFrameType::PING}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::PING,
+                            SpdyFrameType::PING}));
 }
 
 TEST(NgHttp2AdapterTest, ServerHandlesDataWithPadding) {
@@ -2859,7 +2855,7 @@
 
   int send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS}));
 }
 
 // Tests the case where the response body is in the progress of being sent while
@@ -2947,7 +2943,7 @@
 
   send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::HEADERS}));
   visitor.Clear();
 
   // Resuming the stream results in the library wanting to write again.
@@ -3019,8 +3015,8 @@
   // Some bytes should have been serialized.
   EXPECT_EQ(0, send_result);
   // SETTINGS ack
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS,
+                                            SpdyFrameType::RST_STREAM}));
 }
 
 TEST(NgHttp2AdapterTest, ServerErrorWhileHandlingHeadersDropsFrames) {
@@ -3113,9 +3109,9 @@
   int send_result = adapter->Send();
   // Some bytes should have been serialized.
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::RST_STREAM,
+                            SpdyFrameType::RST_STREAM}));
 }
 
 TEST(NgHttp2AdapterTest, ServerConnectionErrorWhileHandlingHeaders) {
@@ -3173,8 +3169,8 @@
   // Some bytes should have been serialized.
   EXPECT_EQ(0, send_result);
   // SETTINGS ack and RST_STREAM
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS,
+                                            SpdyFrameType::RST_STREAM}));
 }
 
 TEST(NgHttp2AdapterTest, ServerErrorAfterHandlingHeaders) {
@@ -3222,7 +3218,7 @@
   // Some bytes should have been serialized.
   EXPECT_EQ(0, send_result);
   // SETTINGS ack
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS}));
 }
 
 // Exercises the case when a visitor chooses to reject a frame based solely on
@@ -3267,7 +3263,7 @@
   // Some bytes should have been serialized.
   EXPECT_EQ(0, send_result);
   // SETTINGS ack
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS}));
 }
 
 TEST(NgHttp2AdapterTest, ServerRejectsBeginningOfData) {
@@ -3323,7 +3319,7 @@
   // Some bytes should have been serialized.
   EXPECT_EQ(0, send_result);
   // SETTINGS ack.
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS}));
 }
 
 TEST(NgHttp2AdapterTest, ServerRejectsStreamData) {
@@ -3379,7 +3375,7 @@
   // Some bytes should have been serialized.
   EXPECT_EQ(0, send_result);
   // SETTINGS ack.
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS}));
 }
 
 TEST(NgHttp2AdapterTest, ServerReceivesTooLargeHeader) {
@@ -3430,7 +3426,7 @@
   // Some bytes should have been serialized.
   EXPECT_EQ(0, send_result);
   // GOAWAY.
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::GOAWAY}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::GOAWAY}));
 }
 
 TEST(NgHttp2AdapterTest, ServerReceivesInvalidAuthority) {
@@ -3480,8 +3476,8 @@
 
   int send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS,
+                                            SpdyFrameType::RST_STREAM}));
 }
 
 TEST(NgHttp2AdapterTest, ServerSubmitResponse) {
@@ -3533,7 +3529,7 @@
 
   int send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS}));
   visitor.Clear();
 
   EXPECT_EQ(0, adapter->GetHpackEncoderDynamicTableSize());
@@ -3564,8 +3560,8 @@
   send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
 
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::HEADERS,
-                                            spdy::SpdyFrameType::DATA}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::HEADERS, SpdyFrameType::DATA}));
   EXPECT_THAT(visitor.data(), testing::HasSubstr(kBody));
   EXPECT_FALSE(adapter->want_write());
 
@@ -3623,8 +3619,8 @@
 
   int send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::GOAWAY}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::GOAWAY}));
 }
 
 TEST(NgHttp2AdapterTest, ServerSendsTrailers) {
@@ -3668,7 +3664,7 @@
 
   int send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS}));
   visitor.Clear();
 
   EXPECT_FALSE(adapter->want_write());
@@ -3691,8 +3687,8 @@
 
   send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::HEADERS,
-                                            spdy::SpdyFrameType::DATA}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::HEADERS, SpdyFrameType::DATA}));
   EXPECT_THAT(visitor.data(), testing::HasSubstr(kBody));
   visitor.Clear();
   EXPECT_FALSE(adapter->want_write());
@@ -3710,7 +3706,7 @@
 
   send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::HEADERS}));
 }
 
 TEST(NgHttp2AdapterTest, ClientSendsContinuation) {
@@ -3866,9 +3862,9 @@
 
   int send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::HEADERS,
-                                            spdy::SpdyFrameType::DATA}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::HEADERS,
+                            SpdyFrameType::DATA}));
 }
 
 TEST(NgHttp2AdapterTest, ServerRespondsToRequestWithTrailers) {
@@ -3921,8 +3917,8 @@
 
   int send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::HEADERS}));
   visitor.Clear();
 
   const std::string more_frames =
@@ -3949,7 +3945,7 @@
 
   send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::DATA}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::DATA}));
 }
 
 TEST(NgHttp2AdapterTest, ServerSubmitsResponseWithDataSourceError) {
@@ -4003,9 +3999,9 @@
 
   int send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::HEADERS,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::HEADERS,
+                            SpdyFrameType::RST_STREAM}));
   visitor.Clear();
   EXPECT_FALSE(adapter->want_write());
 
@@ -4064,8 +4060,8 @@
 
   int send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::HEADERS}));
   EXPECT_FALSE(adapter->want_write());
 }
 
@@ -4111,8 +4107,8 @@
 
   int send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::HEADERS}));
   EXPECT_FALSE(adapter->want_write());
 }
 
@@ -4170,9 +4166,9 @@
 
   int send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::HEADERS,
-                                            spdy::SpdyFrameType::DATA}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::HEADERS,
+                            SpdyFrameType::DATA}));
   EXPECT_THAT(visitor.data(), testing::HasSubstr(kBody));
   visitor.Clear();
   EXPECT_FALSE(adapter->want_write());
@@ -4189,7 +4185,7 @@
 
   send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::HEADERS}));
 }
 
 TEST(NgHttp2AdapterTest, ServerDropsNewStreamBelowWatermark) {
@@ -4252,7 +4248,7 @@
   // Some bytes should have been serialized.
   EXPECT_EQ(0, send_result);
   // SETTINGS ack
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS}));
 }
 
 TEST(NgHttp2AdapterInteractionTest,
@@ -4344,7 +4340,7 @@
   // Some bytes should have been serialized.
   EXPECT_EQ(0, send_result);
   // The GOAWAY apparently causes the SETTINGS ack to be dropped.
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::GOAWAY}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::GOAWAY}));
 }
 
 TEST(NgHttp2AdapterTest, ServerForbidsDataOnIdleStream) {
@@ -4383,7 +4379,7 @@
   // Some bytes should have been serialized.
   EXPECT_EQ(0, send_result);
   // The GOAWAY apparently causes the SETTINGS ack to be dropped.
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::GOAWAY}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::GOAWAY}));
 }
 
 TEST(NgHttp2AdapterTest, ServerForbidsRstStreamOnIdleStream) {
@@ -4424,7 +4420,7 @@
   // Some bytes should have been serialized.
   EXPECT_EQ(0, send_result);
   // The GOAWAY apparently causes the SETTINGS ack to be dropped.
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::GOAWAY}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::GOAWAY}));
 }
 
 TEST(NgHttp2AdapterTest, ServerForbidsNewStreamAboveStreamLimit) {
@@ -4455,8 +4451,8 @@
 
   int send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::SETTINGS}));
   visitor.Clear();
 
   // Let the client send a SETTINGS ack and then attempt to open more than the
@@ -4503,7 +4499,7 @@
 
   send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::GOAWAY}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::GOAWAY}));
 }
 
 TEST(NgHttp2AdapterTest, ServerRstStreamsNewStreamAboveStreamLimitBeforeAck) {
@@ -4534,8 +4530,8 @@
 
   int send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::SETTINGS}));
   visitor.Clear();
 
   // Let the client avoid sending a SETTINGS ack and attempt to open more than
@@ -4579,7 +4575,7 @@
 
   send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::RST_STREAM}));
 }
 
 TEST(NgHttp2AdapterTest, AutomaticSettingsAndPingAcks) {
@@ -4612,8 +4608,8 @@
 
   int send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::PING}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::PING}));
 }
 
 TEST(NgHttp2AdapterTest, AutomaticPingAcksDisabled) {
@@ -4649,7 +4645,7 @@
 
   int send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS}));
 }
 
 TEST(NgHttp2AdapterTest, ServerForbidsProtocolPseudoheaderBeforeAck) {
@@ -4713,9 +4709,9 @@
   adapter->SubmitSettings({{ENABLE_CONNECT_PROTOCOL, 1}});
   int send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::SETTINGS,
+                            SpdyFrameType::RST_STREAM}));
   visitor.Clear();
 
   // The client attempts to send a CONNECT request with the `:protocol`
@@ -4862,11 +4858,10 @@
 
   int send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(
-      visitor.data(),
-      EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                    static_cast<spdy::SpdyFrameType>(kMetadataFrameType),
-                    spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS,
+                            static_cast<SpdyFrameType>(kMetadataFrameType),
+                            SpdyFrameType::RST_STREAM}));
 }
 
 TEST(NgHttp2AdapterTest, ServerStartsShutdown) {
@@ -4883,7 +4878,7 @@
 
   int result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::GOAWAY}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::GOAWAY}));
 }
 
 TEST(NgHttp2AdapterTest, ServerStartsShutdownAfterGoaway) {
@@ -4901,7 +4896,7 @@
 
   int result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::GOAWAY}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::GOAWAY}));
 
   // No-op, since a GOAWAY has previously been enqueued.
   adapter->SubmitShutdownNotice();
@@ -5017,9 +5012,9 @@
   // non-ack SETTINGS frames; nghttp2 sends non-ack SETTINGS frames because they
   // could be the initial SETTINGS frame. However, nghttp2 still allows sending
   // multiple non-ack SETTINGS, which feels non-ideal.
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::GOAWAY}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::SETTINGS,
+                            SpdyFrameType::GOAWAY}));
   visitor.Clear();
 
   // Try to submit more frames for writing. They should not be written.
@@ -5095,8 +5090,8 @@
   EXPECT_TRUE(adapter->want_write());
   int result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS,
+                                            SpdyFrameType::RST_STREAM}));
 }
 
 TEST(NgHttp2AdapterTest, ServerHandlesContentLengthMismatch) {
@@ -5218,11 +5213,11 @@
   EXPECT_TRUE(adapter->want_write());
   int result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM,
-                                            spdy::SpdyFrameType::RST_STREAM,
-                                            spdy::SpdyFrameType::RST_STREAM,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(
+      visitor.data(),
+      EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::RST_STREAM,
+                    SpdyFrameType::RST_STREAM, SpdyFrameType::RST_STREAM,
+                    SpdyFrameType::RST_STREAM}));
 }
 
 TEST(NgHttp2AdapterTest, ServerHandlesAsteriskPathForOptions) {
@@ -5261,7 +5256,7 @@
   EXPECT_TRUE(adapter->want_write());
   int result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS}));
 }
 
 TEST(NgHttp2AdapterTest, ServerHandlesInvalidPath) {
@@ -5347,10 +5342,10 @@
   EXPECT_TRUE(adapter->want_write());
   int result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM,
-                                            spdy::SpdyFrameType::RST_STREAM,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(
+      visitor.data(),
+      EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::RST_STREAM,
+                    SpdyFrameType::RST_STREAM, SpdyFrameType::RST_STREAM}));
 }
 
 TEST(NgHttp2AdapterTest, ServerHandlesTeHeader) {
@@ -5415,8 +5410,8 @@
   EXPECT_TRUE(adapter->want_write());
   int result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS,
+                                            SpdyFrameType::RST_STREAM}));
 }
 
 }  // namespace
diff --git a/http2/adapter/oghttp2_adapter_test.cc b/http2/adapter/oghttp2_adapter_test.cc
index 41de2e4..66f8893 100644
--- a/http2/adapter/oghttp2_adapter_test.cc
+++ b/http2/adapter/oghttp2_adapter_test.cc
@@ -19,6 +19,7 @@
 
 using ConnectionError = Http2VisitorInterface::ConnectionError;
 
+using spdy::SpdyFrameType;
 using testing::_;
 
 enum FrameType {
@@ -41,8 +42,6 @@
   END_HEADERS = 0x04,
 };
 
-using spdy::SpdyFrameType;
-
 class OgHttp2AdapterTest : public testing::Test {
  protected:
   void SetUp() override {
@@ -92,7 +91,7 @@
     absl::string_view data = client_visitor.data();
     EXPECT_THAT(data, testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
     data.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-    EXPECT_THAT(data, EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+    EXPECT_THAT(data, EqualsFrames({SpdyFrameType::SETTINGS}));
   }
 
   // Server sends the connection preface, including the initial SETTINGS.
@@ -102,7 +101,7 @@
     int result = server_adapter->Send();
     EXPECT_EQ(0, result);
     absl::string_view data = server_visitor.data();
-    EXPECT_THAT(data, EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+    EXPECT_THAT(data, EqualsFrames({SpdyFrameType::SETTINGS}));
   }
 
   // Client processes the server's initial bytes, including initial SETTINGS.
@@ -154,7 +153,7 @@
     absl::string_view data = client_visitor.data();
     EXPECT_THAT(data, testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
     data.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-    EXPECT_THAT(data, EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+    EXPECT_THAT(data, EqualsFrames({SpdyFrameType::SETTINGS}));
   }
 
   // Server sends the connection preface, including the initial SETTINGS.
@@ -164,7 +163,7 @@
     int result = server_adapter->Send();
     EXPECT_EQ(0, result);
     absl::string_view data = server_visitor.data();
-    EXPECT_THAT(data, EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+    EXPECT_THAT(data, EqualsFrames({SpdyFrameType::SETTINGS}));
   }
 
   // Client processes the server's initial bytes, including initial SETTINGS.
@@ -227,10 +226,9 @@
 
   int send_result = adapter_->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(
-      http2_visitor_.data(),
-      EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                    spdy::SpdyFrameType::SETTINGS, spdy::SpdyFrameType::PING}));
+  EXPECT_THAT(http2_visitor_.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::SETTINGS,
+                            SpdyFrameType::PING}));
 }
 
 TEST_F(OgHttp2AdapterTest, AutomaticPingAcksDisabled) {
@@ -266,8 +264,8 @@
 
   int send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::SETTINGS}));
 }
 
 TEST(OgHttp2AdapterClientTest, ClientHandles100Headers) {
@@ -343,8 +341,8 @@
   EXPECT_TRUE(adapter->want_write());
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::PING}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::PING}));
 }
 
 TEST(OgHttp2AdapterClientTest, ClientRejects100HeadersWithFin) {
@@ -409,8 +407,8 @@
   EXPECT_TRUE(adapter->want_write());
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS,
+                                            SpdyFrameType::RST_STREAM}));
 }
 
 TEST(OgHttp2AdapterClientTest, ClientRejects100HeadersWithContent) {
@@ -472,8 +470,8 @@
   EXPECT_TRUE(adapter->want_write());
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS,
+                                            SpdyFrameType::RST_STREAM}));
 }
 
 TEST(OgHttp2AdapterClientTest, ClientRejects100HeadersWithContentLength) {
@@ -539,8 +537,8 @@
   EXPECT_TRUE(adapter->want_write());
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS,
+                                            SpdyFrameType::RST_STREAM}));
 }
 
 TEST(OgHttp2AdapterClientTest, ClientHandles204WithContent) {
@@ -602,8 +600,8 @@
   EXPECT_TRUE(adapter->want_write());
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS,
+                                            SpdyFrameType::RST_STREAM}));
 }
 
 TEST(OgHttp2AdapterClientTest, ClientHandles304WithContent) {
@@ -666,8 +664,8 @@
   EXPECT_TRUE(adapter->want_write());
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS,
+                                            SpdyFrameType::RST_STREAM}));
 }
 
 TEST(OgHttp2AdapterClientTest, ClientHandles304WithContentLength) {
@@ -724,7 +722,7 @@
   EXPECT_TRUE(adapter->want_write());
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS}));
 }
 
 TEST(OgHttp2AdapterClientTest, ClientHandlesTrailers) {
@@ -756,8 +754,8 @@
   absl::string_view data = visitor.data();
   EXPECT_THAT(data, testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
   data.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-  EXPECT_THAT(data, EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                  spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(data,
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::HEADERS}));
   visitor.Clear();
 
   const std::string stream_frames =
@@ -804,7 +802,7 @@
   EXPECT_TRUE(adapter->want_write());
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS}));
 }
 
 TEST(OgHttp2AdapterClientTest, ClientSendsTrailers) {
@@ -840,9 +838,9 @@
   absl::string_view data = visitor.data();
   EXPECT_THAT(data, testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
   data.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-  EXPECT_THAT(data, EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                  spdy::SpdyFrameType::HEADERS,
-                                  spdy::SpdyFrameType::DATA}));
+  EXPECT_THAT(data,
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::HEADERS,
+                            SpdyFrameType::DATA}));
   visitor.Clear();
 
   const std::vector<Header> trailers1 =
@@ -855,7 +853,7 @@
   result = adapter->Send();
   EXPECT_EQ(0, result);
   data = visitor.data();
-  EXPECT_THAT(data, EqualsFrames({spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(data, EqualsFrames({SpdyFrameType::HEADERS}));
 }
 
 TEST(OgHttp2AdapterClientTest, ClientHandlesMetadata) {
@@ -887,8 +885,8 @@
   absl::string_view data = visitor.data();
   EXPECT_THAT(data, testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
   data.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-  EXPECT_THAT(data, EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                  spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(data,
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::HEADERS}));
   visitor.Clear();
 
   const std::string stream_frames =
@@ -939,7 +937,7 @@
   EXPECT_TRUE(adapter->want_write());
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS}));
 }
 
 TEST(OgHttp2AdapterClientTest, ClientHandlesMetadataWithEmptyPayload) {
@@ -968,8 +966,8 @@
   absl::string_view data = visitor.data();
   EXPECT_THAT(data, testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
   data.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-  EXPECT_THAT(data, EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                  spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(data,
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::HEADERS}));
   visitor.Clear();
 
   const std::string stream_frames =
@@ -1075,7 +1073,7 @@
   EXPECT_TRUE(adapter->want_write());
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS}));
 }
 
 TEST(OgHttp2AdapterClientTest, ClientHandlesMetadataWithCompletionError) {
@@ -1148,7 +1146,7 @@
   EXPECT_TRUE(adapter->want_write());
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS}));
 }
 
 TEST(OgHttp2AdapterClientTest, ClientRstStreamWhileHandlingHeaders) {
@@ -1180,8 +1178,8 @@
   absl::string_view data = visitor.data();
   EXPECT_THAT(data, testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
   data.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-  EXPECT_THAT(data, EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                  spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(data,
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::HEADERS}));
   visitor.Clear();
 
   const std::string stream_frames =
@@ -1226,8 +1224,8 @@
   EXPECT_TRUE(adapter->want_write());
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS,
+                                            SpdyFrameType::RST_STREAM}));
 }
 
 TEST(OgHttp2AdapterClientTest, ClientConnectionErrorWhileHandlingHeaders) {
@@ -1259,8 +1257,8 @@
   absl::string_view data = visitor.data();
   EXPECT_THAT(data, testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
   data.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-  EXPECT_THAT(data, EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                  spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(data,
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::HEADERS}));
   visitor.Clear();
 
   const std::string stream_frames =
@@ -1298,7 +1296,7 @@
   EXPECT_TRUE(adapter->want_write());
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS}));
 }
 
 TEST(OgHttp2AdapterClientTest, ClientConnectionErrorWhileHandlingHeadersOnly) {
@@ -1330,8 +1328,8 @@
   absl::string_view data = visitor.data();
   EXPECT_THAT(data, testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
   data.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-  EXPECT_THAT(data, EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                  spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(data,
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::HEADERS}));
   visitor.Clear();
 
   const std::string stream_frames =
@@ -1368,7 +1366,7 @@
   EXPECT_TRUE(adapter->want_write());
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS}));
 }
 
 TEST(OgHttp2AdapterClientTest, ClientRejectsHeaders) {
@@ -1400,8 +1398,8 @@
   absl::string_view data = visitor.data();
   EXPECT_THAT(data, testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
   data.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-  EXPECT_THAT(data, EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                  spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(data,
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::HEADERS}));
   visitor.Clear();
 
   const std::string stream_frames =
@@ -1435,7 +1433,7 @@
   EXPECT_TRUE(adapter->want_write());
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS}));
 }
 
 TEST(OgHttp2AdapterClientTest, ClientHandlesSmallerHpackHeaderTableSetting) {
@@ -1692,8 +1690,8 @@
   absl::string_view data = visitor.data();
   EXPECT_THAT(data, testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
   data.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-  EXPECT_THAT(data, EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                  spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(data,
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::HEADERS}));
   visitor.Clear();
 
   const std::string stream_frames =
@@ -1742,8 +1740,8 @@
   EXPECT_TRUE(adapter->want_write());
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS,
+                                            SpdyFrameType::RST_STREAM}));
 }
 
 TEST(OgHttp2AdapterClientTest, ClientStartsShutdown) {
@@ -1799,8 +1797,8 @@
   absl::string_view data = visitor.data();
   EXPECT_THAT(data, testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
   data.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-  EXPECT_THAT(data, EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                  spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(data,
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::HEADERS}));
   visitor.Clear();
 
   const std::string stream_frames =
@@ -1842,7 +1840,7 @@
   EXPECT_TRUE(adapter->want_write());
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS}));
 }
 
 TEST(OgHttp2AdapterClientTest, ClientRejects101Response) {
@@ -1872,8 +1870,8 @@
   absl::string_view data = visitor.data();
   EXPECT_THAT(data, testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
   data.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-  EXPECT_THAT(data, EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                  spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(data,
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::HEADERS}));
   visitor.Clear();
 
   const std::string stream_frames =
@@ -1912,8 +1910,8 @@
   EXPECT_TRUE(adapter->want_write());
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS,
+                                            SpdyFrameType::RST_STREAM}));
 }
 
 TEST(OgHttp2AdapterClientTest, ClientObeysMaxConcurrentStreams) {
@@ -1986,8 +1984,8 @@
 
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::HEADERS,
-                                            spdy::SpdyFrameType::DATA}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::HEADERS, SpdyFrameType::DATA}));
   EXPECT_THAT(visitor.data(), testing::HasSubstr(kBody));
   visitor.Clear();
   EXPECT_FALSE(adapter->want_write());
@@ -2042,7 +2040,7 @@
   result = adapter->Send();
   EXPECT_EQ(0, result);
 
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::HEADERS}));
   visitor.Clear();
   EXPECT_FALSE(adapter->want_write());
 }
@@ -2326,9 +2324,9 @@
 
   int result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::SETTINGS,
+                            SpdyFrameType::RST_STREAM}));
 }
 
 TEST(OgHttp2AdapterClientTest, FailureSendingConnectionPreface) {
@@ -2358,7 +2356,7 @@
   absl::string_view data = visitor.data();
   EXPECT_THAT(data, testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
   data.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-  EXPECT_THAT(data, EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(data, EqualsFrames({SpdyFrameType::SETTINGS}));
 
   visitor.Clear();
 
@@ -2373,7 +2371,7 @@
   EXPECT_CALL(visitor, OnFrameSent(HEADERS, stream_id, _, 0x5, 0));
   write_result = adapter->Send();
   EXPECT_EQ(0, write_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::HEADERS}));
   visitor.Clear();
 
   const std::vector<Header> push_headers =
@@ -2412,7 +2410,7 @@
   int result = adapter->Send();
   EXPECT_EQ(0, result);
   // SETTINGS ack.
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS}));
 }
 
 TEST(OgHttp2AdapterClientTest, ClientForbidsPushStream) {
@@ -2430,7 +2428,7 @@
   absl::string_view data = visitor.data();
   EXPECT_THAT(data, testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
   data.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-  EXPECT_THAT(data, EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(data, EqualsFrames({SpdyFrameType::SETTINGS}));
 
   visitor.Clear();
 
@@ -2445,7 +2443,7 @@
   EXPECT_CALL(visitor, OnFrameSent(HEADERS, stream_id, _, 0x5, 0));
   write_result = adapter->Send();
   EXPECT_EQ(0, write_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::HEADERS}));
   visitor.Clear();
 
   const std::string frames =
@@ -2484,7 +2482,7 @@
   int result = adapter->Send();
   EXPECT_EQ(0, result);
   // SETTINGS ack.
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS}));
 }
 
 TEST(OgHttp2AdapterClientTest, ClientReceivesDataOnClosedStream) {
@@ -2499,7 +2497,7 @@
   absl::string_view data = visitor.data();
   EXPECT_THAT(data, testing::StartsWith(spdy::kHttp2ConnectionHeaderPrefix));
   data.remove_prefix(strlen(spdy::kHttp2ConnectionHeaderPrefix));
-  EXPECT_THAT(data, EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(data, EqualsFrames({SpdyFrameType::SETTINGS}));
   visitor.Clear();
 
   const std::string initial_frames =
@@ -2521,7 +2519,7 @@
 
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::SETTINGS}));
   visitor.Clear();
 
   // Let the client open a stream with a request.
@@ -2539,7 +2537,7 @@
 
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::HEADERS}));
   visitor.Clear();
 
   // Let the client RST_STREAM the stream it opened.
@@ -2553,7 +2551,7 @@
 
   result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::RST_STREAM}));
   visitor.Clear();
 
   // Let the server send a response on the stream. (It might not have received
@@ -2782,10 +2780,9 @@
 
   int result = adapter_->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(
-      http2_visitor_.data(),
-      EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                    static_cast<spdy::SpdyFrameType>(kMetadataFrameType)}));
+  EXPECT_THAT(http2_visitor_.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS,
+                            static_cast<SpdyFrameType>(kMetadataFrameType)}));
   EXPECT_FALSE(adapter_->want_write());
 }
 
@@ -2811,13 +2808,12 @@
   int result = adapter_->Send();
   EXPECT_EQ(0, result);
   absl::string_view serialized = http2_visitor_.data();
-  EXPECT_THAT(
-      serialized,
-      EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                    static_cast<spdy::SpdyFrameType>(kMetadataFrameType),
-                    static_cast<spdy::SpdyFrameType>(kMetadataFrameType),
-                    static_cast<spdy::SpdyFrameType>(kMetadataFrameType),
-                    static_cast<spdy::SpdyFrameType>(kMetadataFrameType)}));
+  EXPECT_THAT(serialized,
+              EqualsFrames({SpdyFrameType::SETTINGS,
+                            static_cast<SpdyFrameType>(kMetadataFrameType),
+                            static_cast<SpdyFrameType>(kMetadataFrameType),
+                            static_cast<SpdyFrameType>(kMetadataFrameType),
+                            static_cast<SpdyFrameType>(kMetadataFrameType)}));
   EXPECT_FALSE(adapter_->want_write());
 }
 
@@ -2834,10 +2830,9 @@
 
   int result = adapter_->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(
-      http2_visitor_.data(),
-      EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                    static_cast<spdy::SpdyFrameType>(kMetadataFrameType)}));
+  EXPECT_THAT(http2_visitor_.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS,
+                            static_cast<SpdyFrameType>(kMetadataFrameType)}));
   EXPECT_FALSE(adapter_->want_write());
 }
 
@@ -3182,9 +3177,8 @@
   int send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
   EXPECT_THAT(visitor.data(),
-              EqualsFrames(
-                  {spdy::SpdyFrameType::SETTINGS, spdy::SpdyFrameType::SETTINGS,
-                   spdy::SpdyFrameType::HEADERS, spdy::SpdyFrameType::DATA}));
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::SETTINGS,
+                            SpdyFrameType::HEADERS, SpdyFrameType::DATA}));
 }
 
 TEST(OgHttp2AdapterServerTest, ServerRespondsToRequestWithTrailers) {
@@ -3240,9 +3234,9 @@
 
   int send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::SETTINGS,
+                            SpdyFrameType::HEADERS}));
   visitor.Clear();
 
   const std::string more_frames =
@@ -3269,7 +3263,7 @@
 
   send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::DATA}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::DATA}));
 }
 
 TEST(OgHttp2AdapterServerTest, ServerReceivesMoreHeaderBytesThanConfigured) {
@@ -3320,8 +3314,8 @@
   int send_result = adapter->Send();
   // Some bytes should have been serialized.
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::GOAWAY}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::GOAWAY}));
 }
 
 TEST(OgHttp2AdapterServerTest, ServerSubmitsResponseWithDataSourceError) {
@@ -3377,9 +3371,9 @@
 
   int send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::SETTINGS,
+                            SpdyFrameType::HEADERS}));
   visitor.Clear();
   EXPECT_FALSE(adapter->want_write());
 
@@ -3442,9 +3436,9 @@
 
   int send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::SETTINGS,
+                            SpdyFrameType::HEADERS}));
   EXPECT_FALSE(adapter->want_write());
 }
 
@@ -3493,9 +3487,9 @@
 
   int send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::SETTINGS,
+                            SpdyFrameType::HEADERS}));
   EXPECT_FALSE(adapter->want_write());
 }
 
@@ -3548,10 +3542,10 @@
 
   int send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::HEADERS,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(
+      visitor.data(),
+      EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::SETTINGS,
+                    SpdyFrameType::HEADERS, SpdyFrameType::RST_STREAM}));
   EXPECT_FALSE(adapter->want_write());
 }
 
@@ -3613,9 +3607,8 @@
   int send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
   EXPECT_THAT(visitor.data(),
-              EqualsFrames(
-                  {spdy::SpdyFrameType::SETTINGS, spdy::SpdyFrameType::SETTINGS,
-                   spdy::SpdyFrameType::HEADERS, spdy::SpdyFrameType::DATA}));
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::SETTINGS,
+                            SpdyFrameType::HEADERS, SpdyFrameType::DATA}));
   EXPECT_THAT(visitor.data(), testing::HasSubstr(kBody));
   visitor.Clear();
   EXPECT_FALSE(adapter->want_write());
@@ -3632,7 +3625,7 @@
 
   send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::HEADERS}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::HEADERS}));
 }
 
 TEST(OgHttp2AdapterServerTest, ServerHandlesDataWithPadding) {
@@ -3692,8 +3685,8 @@
 
   int send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::SETTINGS}));
 }
 
 // Tests the case where the response body is in the progress of being sent while
@@ -3800,7 +3793,7 @@
 
       send_result = adapter->Send();
       EXPECT_EQ(0, send_result);
-      EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::HEADERS}));
+      EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::HEADERS}));
     }
   }
 }
@@ -3861,9 +3854,9 @@
   // Some bytes should have been serialized.
   EXPECT_EQ(0, send_result);
   // SETTINGS ack
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::SETTINGS,
+                            SpdyFrameType::RST_STREAM}));
 }
 
 TEST(OgHttp2AdapterServerTest, ServerErrorWhileHandlingHeadersDropsFrames) {
@@ -3948,10 +3941,10 @@
   // Some bytes should have been serialized.
   EXPECT_EQ(0, send_result);
   // SETTINGS ack
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(
+      visitor.data(),
+      EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::SETTINGS,
+                    SpdyFrameType::RST_STREAM, SpdyFrameType::RST_STREAM}));
 }
 
 TEST(OgHttp2AdapterServerTest, ServerConnectionErrorWhileHandlingHeaders) {
@@ -4011,9 +4004,9 @@
   int send_result = adapter->Send();
   // Some bytes should have been serialized.
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM,
-                                            spdy::SpdyFrameType::GOAWAY}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::RST_STREAM,
+                            SpdyFrameType::GOAWAY}));
 }
 
 TEST(OgHttp2AdapterServerTest, ServerErrorAfterHandlingHeaders) {
@@ -4065,8 +4058,8 @@
   int send_result = adapter->Send();
   // Some bytes should have been serialized.
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::GOAWAY}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::GOAWAY}));
 }
 
 // Exercises the case when a visitor chooses to reject a frame based solely on
@@ -4115,8 +4108,8 @@
   int send_result = adapter->Send();
   // Some bytes should have been serialized.
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::GOAWAY}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::GOAWAY}));
 }
 
 TEST(OgHttp2AdapterServerTest, ServerRejectsBeginningOfData) {
@@ -4176,8 +4169,8 @@
   int send_result = adapter->Send();
   // Some bytes should have been serialized.
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::GOAWAY}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::GOAWAY}));
 }
 
 TEST(OgHttp2AdapterServerTest, ServerReceivesTooLargeHeader) {
@@ -4246,9 +4239,9 @@
 
   int send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::SETTINGS,
+                            SpdyFrameType::RST_STREAM}));
 }
 
 TEST(OgHttp2AdapterServerTest, ServerReceivesInvalidAuthority) {
@@ -4297,9 +4290,9 @@
 
   int send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::SETTINGS,
+                            SpdyFrameType::RST_STREAM}));
 }
 
 TEST(OgHttp2AdapterServerTest, ServerRejectsStreamData) {
@@ -4359,8 +4352,8 @@
   int send_result = adapter->Send();
   // Some bytes should have been serialized.
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::GOAWAY}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::GOAWAY}));
 }
 
 // Exercises a naive mutually recursive test client and server. This test fails
@@ -4539,8 +4532,8 @@
   int send_result = adapter->Send();
   // Some bytes should have been serialized.
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::GOAWAY}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::GOAWAY}));
 }
 
 TEST(OgHttp2AdapterServerTest, ServerForbidsWindowUpdateOnIdleStream) {
@@ -4580,8 +4573,8 @@
   int send_result = adapter->Send();
   // Some bytes should have been serialized.
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::GOAWAY}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::GOAWAY}));
 }
 
 TEST(OgHttp2AdapterServerTest, ServerForbidsDataOnIdleStream) {
@@ -4623,8 +4616,8 @@
   int send_result = adapter->Send();
   // Some bytes should have been serialized.
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::GOAWAY}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::GOAWAY}));
 }
 
 TEST(OgHttp2AdapterServerTest, ServerForbidsRstStreamOnIdleStream) {
@@ -4667,8 +4660,8 @@
   int send_result = adapter->Send();
   // Some bytes should have been serialized.
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::GOAWAY}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::GOAWAY}));
 }
 
 TEST(OgHttp2AdapterServerTest, ServerForbidsNewStreamAboveStreamLimit) {
@@ -4700,8 +4693,8 @@
 
   int send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::SETTINGS}));
   visitor.Clear();
 
   // Let the client send a SETTINGS ack and then attempt to open more than the
@@ -4752,7 +4745,7 @@
 
   send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::GOAWAY}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::GOAWAY}));
 }
 
 TEST(OgHttp2AdapterServerTest,
@@ -4785,8 +4778,8 @@
 
   int send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::SETTINGS}));
   visitor.Clear();
 
   // Let the client avoid sending a SETTINGS ack and attempt to open more than
@@ -4830,7 +4823,7 @@
 
   send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(), EqualsFrames({SpdyFrameType::RST_STREAM}));
 }
 
 TEST(OgHttp2AdapterServerTest, ServerForbidsProtocolPseudoheaderBeforeAck) {
@@ -4895,10 +4888,10 @@
   adapter->SubmitSettings({{ENABLE_CONNECT_PROTOCOL, 1}});
   int send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM,
-                                            spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(
+      visitor.data(),
+      EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::SETTINGS,
+                    SpdyFrameType::RST_STREAM, SpdyFrameType::SETTINGS}));
   visitor.Clear();
 
   // The client attempts to send a CONNECT request with the `:protocol`
@@ -5047,9 +5040,9 @@
 
   int send_result = adapter->Send();
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::SETTINGS,
+                            SpdyFrameType::RST_STREAM}));
 }
 
 TEST(OgHttpAdapterServerTest, ServerStartsShutdown) {
@@ -5237,8 +5230,8 @@
   int send_result = adapter->Send();
   // Some bytes should have been serialized.
   EXPECT_EQ(0, send_result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::GOAWAY}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::GOAWAY}));
   visitor.Clear();
 
   // Try to submit more frames for writing. They should not be written.
@@ -5314,9 +5307,9 @@
   EXPECT_TRUE(adapter->want_write());
   int result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::SETTINGS,
+                            SpdyFrameType::RST_STREAM}));
 }
 
 TEST(OgHttp2AdapterServerTest, ServerHandlesContentLengthMismatch) {
@@ -5442,10 +5435,9 @@
   EXPECT_EQ(0, result);
   EXPECT_THAT(
       visitor.data(),
-      EqualsFrames(
-          {spdy::SpdyFrameType::SETTINGS, spdy::SpdyFrameType::SETTINGS,
-           spdy::SpdyFrameType::RST_STREAM, spdy::SpdyFrameType::RST_STREAM,
-           spdy::SpdyFrameType::RST_STREAM, spdy::SpdyFrameType::RST_STREAM}));
+      EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::SETTINGS,
+                    SpdyFrameType::RST_STREAM, SpdyFrameType::RST_STREAM,
+                    SpdyFrameType::RST_STREAM, SpdyFrameType::RST_STREAM}));
 }
 
 TEST(OgHttp2AdapterServerTest, ServerHandlesAsteriskPathForOptions) {
@@ -5487,8 +5479,8 @@
   EXPECT_TRUE(adapter->want_write());
   int result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::SETTINGS}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::SETTINGS}));
 }
 
 TEST(OgHttp2AdapterServerTest, ServerHandlesInvalidPath) {
@@ -5573,11 +5565,11 @@
   EXPECT_TRUE(adapter->want_write());
   int result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM,
-                                            spdy::SpdyFrameType::RST_STREAM,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(
+      visitor.data(),
+      EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::SETTINGS,
+                    SpdyFrameType::RST_STREAM, SpdyFrameType::RST_STREAM,
+                    SpdyFrameType::RST_STREAM}));
 }
 
 TEST(OgHttp2AdapterServerTest, ServerHandlesTeHeader) {
@@ -5641,9 +5633,9 @@
   EXPECT_TRUE(adapter->want_write());
   int result = adapter->Send();
   EXPECT_EQ(0, result);
-  EXPECT_THAT(visitor.data(), EqualsFrames({spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::SETTINGS,
-                                            spdy::SpdyFrameType::RST_STREAM}));
+  EXPECT_THAT(visitor.data(),
+              EqualsFrames({SpdyFrameType::SETTINGS, SpdyFrameType::SETTINGS,
+                            SpdyFrameType::RST_STREAM}));
 }
 
 }  // namespace