Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(388)

Side by Side Diff: net/spdy/spdy_test_util_spdy3.cc

Issue 10054034: SPDY - replaced SpdySettings (list) with SettingsMap (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/spdy/spdy_test_util_spdy3.h ('k') | net/spdy/spdy_websocket_stream_spdy2_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/spdy/spdy_test_util_spdy3.h" 5 #include "net/spdy/spdy_test_util_spdy3.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 header_info.data_length, 207 header_info.data_length,
208 header_info.data_flags); 208 header_info.data_flags);
209 break; 209 break;
210 } 210 }
211 return frame; 211 return frame;
212 } 212 }
213 213
214 // Construct an expected SPDY SETTINGS frame. 214 // Construct an expected SPDY SETTINGS frame.
215 // |settings| are the settings to set. 215 // |settings| are the settings to set.
216 // Returns the constructed frame. The caller takes ownership of the frame. 216 // Returns the constructed frame. The caller takes ownership of the frame.
217 SpdyFrame* ConstructSpdySettings( 217 SpdyFrame* ConstructSpdySettings(const SettingsMap& settings) {
218 const SpdySettings& settings) {
219 BufferedSpdyFramer framer(3); 218 BufferedSpdyFramer framer(3);
220 return framer.CreateSettings(settings); 219 return framer.CreateSettings(settings);
221 } 220 }
222 221
223 // Construct an expected SPDY CREDENTIAL frame. 222 // Construct an expected SPDY CREDENTIAL frame.
224 // |credential| is the credential to sen. 223 // |credential| is the credential to sen.
225 // Returns the constructed frame. The caller takes ownership of the frame. 224 // Returns the constructed frame. The caller takes ownership of the frame.
226 SpdyFrame* ConstructSpdyCredential( 225 SpdyFrame* ConstructSpdyCredential(
227 const SpdyCredential& credential) { 226 const SpdyCredential& credential) {
228 BufferedSpdyFramer framer(3); 227 BufferedSpdyFramer framer(3);
(...skipping 768 matching lines...) Expand 10 before | Expand all | Expand 10 after
997 996
998 SpdyTestStateHelper::~SpdyTestStateHelper() { 997 SpdyTestStateHelper::~SpdyTestStateHelper() {
999 SpdySession::ResetStaticSettingsToInit(); 998 SpdySession::ResetStaticSettingsToInit();
1000 // TODO(rch): save/restore this value 999 // TODO(rch): save/restore this value
1001 SpdyFramer::set_enable_compression_default(true); 1000 SpdyFramer::set_enable_compression_default(true);
1002 } 1001 }
1003 1002
1004 } // namespace test_spdy3 1003 } // namespace test_spdy3
1005 1004
1006 } // namespace net 1005 } // namespace net
OLDNEW
« no previous file with comments | « net/spdy/spdy_test_util_spdy3.h ('k') | net/spdy/spdy_websocket_stream_spdy2_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698