Merge spdy2 and spdy3 versions of SpdyHeaderInfo.

Another step to the eventual merging of _spdy2 and _spdy3 unittests across
the codebase.

BUG=226192

Review URL: https://chromiumcodereview.appspot.com/14244016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194820 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 33 insertions, 35 deletions

diff --git a/net/spdy/spdy_network_transaction_spdy2_unittest.cc b/net/spdy/spdy_network_transaction_spdy2_unittest.cc
index d5ad2bb..a5ac96b 100644
--- a/net/spdy/spdy_network_transaction_spdy2_unittest.cc
+++ b/net/spdy/spdy_network_transaction_spdy2_unittest.cc
@@ -1497,6 +1497,7 @@ TEST_P(SpdyNetworkTransactionSpdy2Test, Put) {
     1,                      // Stream ID
     0,                      // Associated stream ID
     ConvertRequestPriorityToSpdyPriority(LOWEST, 2),  // Priority
+    kSpdyCredentialSlotUnused,
     CONTROL_FLAG_FIN,       // Control Flags
     false,                  // Compressed
     RST_STREAM_INVALID,     // Status
@@ -1524,6 +1525,7 @@ TEST_P(SpdyNetworkTransactionSpdy2Test, Put) {
     1,                      // Stream ID
     0,                      // Associated stream ID
     ConvertRequestPriorityToSpdyPriority(LOWEST, 2),  // Priority
+    kSpdyCredentialSlotUnused,
     CONTROL_FLAG_NONE,      // Control Flags
     false,                  // Compressed
     RST_STREAM_INVALID,     // Status
@@ -1567,6 +1569,7 @@ TEST_P(SpdyNetworkTransactionSpdy2Test, Head) {
     1,                      // Stream ID
     0,                      // Associated stream ID
     ConvertRequestPriorityToSpdyPriority(LOWEST, 2),  // Priority
+    kSpdyCredentialSlotUnused,
     CONTROL_FLAG_FIN,       // Control Flags
     false,                  // Compressed
     RST_STREAM_INVALID,     // Status
@@ -1594,6 +1597,7 @@ TEST_P(SpdyNetworkTransactionSpdy2Test, Head) {
     1,                      // Stream ID
     0,                      // Associated stream ID
     ConvertRequestPriorityToSpdyPriority(LOWEST, 2),  // Priority
+    kSpdyCredentialSlotUnused,
     CONTROL_FLAG_NONE,      // Control Flags
     false,                  // Compressed
     RST_STREAM_INVALID,     // Status
@@ -3310,6 +3314,7 @@ TEST_P(SpdyNetworkTransactionSpdy2Test, SynReplyHeadersVary) {
     1,                                      // Stream ID
     0,                                      // Associated Stream ID
     ConvertRequestPriorityToSpdyPriority(LOWEST, 2),  // Priority
+    kSpdyCredentialSlotUnused,
     CONTROL_FLAG_NONE,                      // Control Flags
     false,                                  // Compressed
     RST_STREAM_INVALID,                     // Status
@@ -3477,6 +3482,7 @@ TEST_P(SpdyNetworkTransactionSpdy2Test, InvalidSynReply) {
     1,                      // Stream ID
     0,                      // Associated stream ID
     ConvertRequestPriorityToSpdyPriority(LOWEST, 2),  // Priority
+    kSpdyCredentialSlotUnused,
     CONTROL_FLAG_NONE,      // Control Flags
     false,                  // Compressed
     RST_STREAM_INVALID,     // Status
@@ -4190,6 +4196,7 @@ TEST_P(SpdyNetworkTransactionSpdy2Test, SettingsSaved) {
     1,                                      // Stream ID
     0,                                      // Associated Stream ID
     ConvertRequestPriorityToSpdyPriority(LOWEST, 2),  // Priority
+    kSpdyCredentialSlotUnused,
     CONTROL_FLAG_NONE,                      // Control Flags
     false,                                  // Compressed
     RST_STREAM_INVALID,                     // Status
@@ -4296,6 +4303,7 @@ TEST_P(SpdyNetworkTransactionSpdy2Test, SettingsPlayback) {
     1,                                      // Stream ID
     0,                                      // Associated Stream ID
     ConvertRequestPriorityToSpdyPriority(LOWEST, 2),  // Priority
+    kSpdyCredentialSlotUnused,
     CONTROL_FLAG_NONE,                      // Control Flags
     false,                                  // Compressed
     RST_STREAM_INVALID,                     // Status
diff --git a/net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc b/net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc
index a03d465..eb19444 100644
--- a/net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc
+++ b/net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc
@@ -323,6 +323,7 @@ SpdyProxyClientSocketSpdy2Test::ConstructConnectRequestFrame() {
     kStreamId,
     0,
     net::ConvertRequestPriorityToSpdyPriority(LOWEST, 2),
+    kSpdyCredentialSlotUnused,
     CONTROL_FLAG_NONE,
     false,
     RST_STREAM_INVALID,
@@ -350,6 +351,7 @@ SpdyProxyClientSocketSpdy2Test::ConstructConnectAuthRequestFrame() {
     kStreamId,
     0,
     net::ConvertRequestPriorityToSpdyPriority(LOWEST, 2),
+    kSpdyCredentialSlotUnused,
     CONTROL_FLAG_NONE,
     false,
     RST_STREAM_INVALID,
diff --git a/net/spdy/spdy_test_util_common.h b/net/spdy/spdy_test_util_common.h
index b5be964..535023c 100644
--- a/net/spdy/spdy_test_util_common.h
+++ b/net/spdy/spdy_test_util_common.h
@@ -143,6 +143,23 @@ class StreamReleaserCallback : public TestCompletionCallbackBase {
   scoped_refptr<SpdyStream> first_stream_;
 };
 
+const size_t kSpdyCredentialSlotUnused = 0;
+
+// This struct holds information used to construct spdy control and data frames.
+struct SpdyHeaderInfo {
+  SpdyFrameType kind;
+  SpdyStreamId id;
+  SpdyStreamId assoc_id;
+  SpdyPriority priority;
+  size_t credential_slot;  // SPDY3 only
+  SpdyControlFlags control_flags;
+  bool compressed;
+  SpdyRstStreamStatus status;
+  const char* data;
+  uint32 data_length;
+  SpdyDataFlags data_flags;
+};
+
 }  // namespace net
 
 #endif  // NET_SPDY_SPDY_TEST_UTIL_COMMON_H_
diff --git a/net/spdy/spdy_test_util_spdy2.cc b/net/spdy/spdy_test_util_spdy2.cc
index dd34079..a1ac366 100644
--- a/net/spdy/spdy_test_util_spdy2.cc
+++ b/net/spdy/spdy_test_util_spdy2.cc
@@ -247,6 +247,7 @@ SpdyFrame* ConstructSpdyControlFrame(const char* const extra_headers[],
     associated_stream_id,         // Associated stream ID
     ConvertRequestPriorityToSpdyPriority(request_priority, 2),
                                   // Priority
+    kSpdyCredentialSlotUnused,
     flags,                        // Control Flags
     compressed,                   // Compressed
     RST_STREAM_INVALID,           // Status
@@ -276,6 +277,7 @@ SpdyFrame* ConstructSpdyGet(const char* const url,
     0,                      // Associated stream ID
     ConvertRequestPriorityToSpdyPriority(request_priority, 2),
                             // Priority
+    kSpdyCredentialSlotUnused,
     CONTROL_FLAG_FIN,       // Control Flags
     compressed,             // Compressed
     RST_STREAM_INVALID,     // Status
@@ -537,6 +539,7 @@ SpdyFrame* ConstructSpdyPost(const char* url,
     0,                      // Associated stream ID
     ConvertRequestPriorityToSpdyPriority(LOWEST, 2),
                             // Priority
+    kSpdyCredentialSlotUnused,
     CONTROL_FLAG_NONE,      // Control Flags
     false,                  // Compressed
     RST_STREAM_INVALID,     // Status
@@ -821,6 +824,7 @@ const SpdyHeaderInfo MakeSpdyHeader(SpdyFrameType type) {
     1,                            // Stream ID
     0,                            // Associated stream ID
     ConvertRequestPriorityToSpdyPriority(LOWEST, 2),  // Priority
+    kSpdyCredentialSlotUnused,
     CONTROL_FLAG_FIN,       // Control Flags
     false,                        // Compressed
     RST_STREAM_INVALID,           // Status
diff --git a/net/spdy/spdy_test_util_spdy2.h b/net/spdy/spdy_test_util_spdy2.h
index d77fda3..efac7f8 100644
--- a/net/spdy/spdy_test_util_spdy2.h
+++ b/net/spdy/spdy_test_util_spdy2.h
@@ -30,21 +30,6 @@ namespace net {
 
 namespace test_spdy2 {
 
-// NOTE: In GCC, on a Mac, this can't be in an anonymous namespace!
-// This struct holds information used to construct spdy control and data frames.
-struct SpdyHeaderInfo {
-  SpdyFrameType kind;
-  SpdyStreamId id;
-  SpdyStreamId assoc_id;
-  SpdyPriority priority;
-  SpdyControlFlags control_flags;
-  bool compressed;
-  SpdyRstStreamStatus status;
-  const char* data;
-  uint32 data_length;
-  SpdyDataFlags data_flags;
-};
-
 // Constructs a HeaderBlock for a GET request for the given URL.
 scoped_ptr<SpdyHeaderBlock> ConstructGetHeaderBlock(base::StringPiece url);
 
diff --git a/net/spdy/spdy_test_util_spdy3.h b/net/spdy/spdy_test_util_spdy3.h
index 441c467..aa1c360 100644
--- a/net/spdy/spdy_test_util_spdy3.h
+++ b/net/spdy/spdy_test_util_spdy3.h
@@ -36,26 +36,6 @@ namespace net {
 
 namespace test_spdy3 {
 
-// NOTE: In GCC, on a Mac, this can't be in an anonymous namespace!
-// This struct holds information used to construct spdy control and data frames.
-//
-// TODO(akalin): Combine this struct with
-// test_spdy2::SpdyHeaderInfo. (This only adds the |credential_slot|
-// field).
-struct SpdyHeaderInfo {
-  SpdyFrameType kind;
-  SpdyStreamId id;
-  SpdyStreamId assoc_id;
-  SpdyPriority priority;
-  size_t credential_slot;
-  SpdyControlFlags control_flags;
-  bool compressed;
-  SpdyRstStreamStatus status;
-  const char* data;
-  uint32 data_length;
-  SpdyDataFlags data_flags;
-};
-
 // An ECSignatureCreator that returns deterministic signatures.
 class MockECSignatureCreator : public crypto::ECSignatureCreator {
  public:
diff --git a/net/spdy/spdy_websocket_test_util_spdy2.cc b/net/spdy/spdy_websocket_test_util_spdy2.cc
index 7311c28..16536dd 100644
--- a/net/spdy/spdy_websocket_test_util_spdy2.cc
+++ b/net/spdy/spdy_websocket_test_util_spdy2.cc
@@ -74,6 +74,7 @@ SpdyFrame* ConstructSpdyWebSocketHandshakeRequestFrame(
     stream_id,
     kDefaultAssociatedStreamId,
     ConvertRequestPriorityToSpdyPriority(request_priority, 2),
+    kSpdyCredentialSlotUnused,
     CONTROL_FLAG_NONE,
     kDefaultCompressed,
     RST_STREAM_INVALID,
@@ -103,6 +104,7 @@ SpdyFrame* ConstructSpdyWebSocketHandshakeResponseFrame(
     stream_id,
     kDefaultAssociatedStreamId,
     ConvertRequestPriorityToSpdyPriority(request_priority, 2),
+    kSpdyCredentialSlotUnused,
     CONTROL_FLAG_NONE,
     kDefaultCompressed,
     RST_STREAM_INVALID,