Refactor pooling logic into a helper method

net/spdy/spdy_test_utils.h

 // 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.
 
 #ifndef NET_SPDY_TEST_UTILS_H_
 #define NET_SPDY_TEST_UTILS_H_
 
 #include <string>
 
+#include "net/base/hash_value.h"

[Ryan Sleevi, 2014/08/11 18:45:17]

Can forward declare this.

See http://www.chromium.org/developers/coding-style/cpp-dos-and-donts

"Forward OrReturnValue()"

[Ryan Hamilton, 2014/08/12 14:39:06]

Whoa! You forward declare if it's used as a return value? Wow. I would not have
expected this to be possible, since i would have expected that the size would
need to be known... But I guess not! I guess it needs to be know if it's
*called* but not if it's declared.

Done.

[Ryan Sleevi, 2014/08/12 14:52:03]

Yup. That's exactly it - you don't need to know the size until you attempt to
call it.

+#include "net/http/transport_security_state.h"

[Ryan Sleevi, 2014/08/11 18:45:17]

Can forward declare this - only used as a pointer.

[Ryan Hamilton, 2014/08/12 14:39:06]

Done.

 #include "net/spdy/spdy_protocol.h"
 
 namespace net {
 
 namespace test {
 
 std::string HexDumpWithMarks(const unsigned char* data, int length,
                              const bool* marks, int mark_length);
 
 void CompareCharArraysWithHexError(
     const std::string& description,
     const unsigned char* actual,
     const int actual_len,
     const unsigned char* expected,
     const int expected_len);
 
 void SetFrameFlags(SpdyFrame* frame,
                    uint8 flags,
                    SpdyMajorVersion spdy_version);
 
 void SetFrameLength(SpdyFrame* frame,
                     size_t length,
                     SpdyMajorVersion spdy_version);
 
 std::string a2b_hex(const char* hex_data);
 
+// Returns a SHA1 HashValue in which each byte has the value |label|.
+HashValue GetTestHashValue(uint8 label);

[Ryan Sleevi, 2014/08/11 18:45:17]

1) These should be using uint8_t, not uint8, in SPDY land.
2) IWYU: You should be including <stdint.h> (uint8_t) OR "base/basictypes.h"
(uint8), rather than relying on spdy_protocol.h to do so.

[Ryan Hamilton, 2014/08/12 14:39:06]

I'm not sure I follow? We use basictypes all the time in SPDY code. (Both
internally and externally)
Done.

[Ryan Sleevi, 2014/08/12 14:52:03]

Basictypes is deprecated in Chrome. It existed because MSVC didn't support the
C99 stdint.h - but now it does.

I can't imagine it being essential on the internal code either - e.g. I expect
stdint to exist.

Hence the uint8_t (standard) over uint8 (ours)

[Ryan Hamilton, 2014/08/12 15:37:10]

*sigh* I "love" it that we deprecate stuff but don't use automated tools to
convert to the new standard. We use uint8 140+ times in net/ .h files, and we
use uint8_t 1 time. *boggle*
I'm sure it exists, but the standards have not switched yet. The style guide
says "For consistency, use our existing integer types rather than C++11's
equivalents like int16_t where possible." 
In any case, this code is not shared so I'm happy to use the preferred Chrome
solution. 

Done.

+
+// Returns SHA1 pinning header for the of the base64 encoding of
+// GetTestHashValue(|label|).
+std::string GetTestPin(uint8 label);
+
+// Adds a pin for |host| to |state|.
+void AddPin(TransportSecurityState* state,
+            const std::string& host,
+            uint8 primary_label,
+            uint8 backup_label);
+
 }  // namespace test
 
 }  // namespace net
 
 #endif  // NET_SPDY_TEST_UTILS_H_