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

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

Issue 13878015: Avoid C++11 narrowing errors. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@speech-dispatcher-version-fix
Patch Set: Try to make MSVC happy Created 7 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
« no previous file with comments | « net/spdy/spdy_test_util_spdy3.h ('k') | no next file » | 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 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 this_header, 258 this_header,
259 this_value); 259 this_value);
260 return n; 260 return n;
261 } 261 }
262 262
263 SpdyFrame* ConstructSpdyControlFrameWithVersion( 263 SpdyFrame* ConstructSpdyControlFrameWithVersion(
264 int spdy_version, 264 int spdy_version,
265 const char* const extra_headers[], 265 const char* const extra_headers[],
266 int extra_header_count, 266 int extra_header_count,
267 bool compressed, 267 bool compressed,
268 int stream_id, 268 SpdyStreamId stream_id,
269 RequestPriority request_priority, 269 RequestPriority request_priority,
270 SpdyFrameType type, 270 SpdyFrameType type,
271 SpdyControlFlags flags, 271 SpdyControlFlags flags,
272 const char* const* kHeaders, 272 const char* const* kHeaders,
273 int kHeadersSize, 273 int kHeadersSize,
274 SpdyStreamId associated_stream_id) { 274 SpdyStreamId associated_stream_id) {
275 EXPECT_GE(type, FIRST_CONTROL_TYPE); 275 EXPECT_GE(type, FIRST_CONTROL_TYPE);
276 EXPECT_LE(type, LAST_CONTROL_TYPE); 276 EXPECT_LE(type, LAST_CONTROL_TYPE);
277 const SpdyHeaderInfo kSynStartHeader = { 277 const SpdyHeaderInfo kSynStartHeader = {
278 type, // Kind = Syn 278 type, // Kind = Syn
(...skipping 654 matching lines...) Expand 10 before | Expand all | Expand 10 after
933 NULL, // Data 933 NULL, // Data
934 0, // Length 934 0, // Length
935 DATA_FLAG_NONE // Data Flags 935 DATA_FLAG_NONE // Data Flags
936 }; 936 };
937 return kHeader; 937 return kHeader;
938 } 938 }
939 939
940 } // namespace test_spdy3 940 } // namespace test_spdy3
941 941
942 } // namespace net 942 } // namespace net
OLDNEW
« no previous file with comments | « net/spdy/spdy_test_util_spdy3.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698