Log sending HTTP/2 HEADERS frames correctly.

net/spdy/spdy_network_transaction_unittest.cc

 // Copyright (c) 2012 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 <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_util.h"
@@ skipping 3761 matching lines @@
       net::NetLog::TYPE_HTTP_TRANSACTION_READ_HEADERS,
       net::NetLog::PHASE_END);
   pos = net::ExpectLogContainsSomewhere(entries, pos + 1,
       net::NetLog::TYPE_HTTP_TRANSACTION_READ_BODY,
       net::NetLog::PHASE_BEGIN);
   pos = net::ExpectLogContainsSomewhere(entries, pos + 1,
       net::NetLog::TYPE_HTTP_TRANSACTION_READ_BODY,
       net::NetLog::PHASE_END);
 
   // Check that we logged all the headers correctly
-  pos = net::ExpectLogContainsSomewhere(
-      entries, 0, net::NetLog::TYPE_HTTP2_SESSION_SYN_STREAM,
-      net::NetLog::PHASE_NONE);
+  const NetLog::EventType type =

[mmenke, 2015/02/26 16:04:19]

optional nit:  const generally isn't used for things that aren't build time
constants or constant class variables.

+      (GetParam().protocol <= kProtoSPDY31)
+          ? net::NetLog::TYPE_HTTP2_SESSION_SYN_STREAM
+          : net::NetLog::TYPE_HTTP2_SESSION_SEND_HEADERS;
+  pos = net::ExpectLogContainsSomewhere(entries, 0, type,
+                                        net::NetLog::PHASE_NONE);
 
   base::ListValue* header_list;
   ASSERT_TRUE(entries[pos].params.get());
   ASSERT_TRUE(entries[pos].params->GetList("headers", &header_list));
 
   std::vector<std::string> expected;
   expected.push_back(std::string(spdy_util_.GetHostKey()) + ": www.google.com");
   expected.push_back(std::string(spdy_util_.GetPathKey()) + ": /");
   expected.push_back(std::string(spdy_util_.GetSchemeKey()) + ": http");
   expected.push_back(std::string(spdy_util_.GetMethodKey()) + ": GET");
@@ skipping 3024 matching lines @@
 TEST_P(SpdyNetworkTransactionTLSUsageCheckTest, TLSCipherSuiteSucky) {
   scoped_ptr<SSLSocketDataProvider> ssl_provider(
       new SSLSocketDataProvider(ASYNC, OK));
   // Set to TLS_RSA_WITH_NULL_MD5
   SSLConnectionStatusSetCipherSuite(0x1, &ssl_provider->connection_status);
 
   RunTLSUsageCheckTest(ssl_provider.Pass());
 }
 
 }  // namespace net