| Index: net/spdy/chromium/spdy_test_util_common.h | 
| diff --git a/net/spdy/chromium/spdy_test_util_common.h b/net/spdy/chromium/spdy_test_util_common.h | 
| index be5f42945c89cdf1a9772faf5813eefa4c9291c5..82e5a56c9c9f611e2239dec8c5298b1beaf7fec3 100644 | 
| --- a/net/spdy/chromium/spdy_test_util_common.h | 
| +++ b/net/spdy/chromium/spdy_test_util_common.h | 
| @@ -90,12 +90,9 @@ MockRead CreateMockRead(const SpdySerializedFrame& resp, int seq); | 
|  | 
| MockRead CreateMockRead(const SpdySerializedFrame& resp, int seq, IoMode mode); | 
|  | 
| -// Combines the given SpdySerializedFrame into the given char array and returns | 
| -// the total length. | 
| -int CombineFrames(const SpdySerializedFrame** frames, | 
| -                  int num_frames, | 
| -                  char* buf, | 
| -                  int buf_len); | 
| +// Combines the given vector of SpdySerializedFrame into a single frame. | 
| +SpdySerializedFrame CombineFrames( | 
| +    std::vector<const SpdySerializedFrame*> frames); | 
|  | 
| // Returns the SpdyPriority embedded in the given frame.  Returns true | 
| // and fills in |priority| on success. | 
|  |