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

Side by Side Diff: net/quic/quic_stream_sequencer_test.cc

Issue 925423004: Fully qualify std::* names being exported internally by using (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ignore_goaways_86198166
Patch Set: Created 5 years, 10 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/quic/quic_stream_sequencer.cc ('k') | net/quic/quic_time_wait_list_manager.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/quic/quic_stream_sequencer.h" 5 #include "net/quic/quic_stream_sequencer.h"
6 6
7 #include <utility> 7 #include <utility>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 public: 331 public:
332 typedef pair<int, string> Frame; 332 typedef pair<int, string> Frame;
333 typedef vector<Frame> FrameList; 333 typedef vector<Frame> FrameList;
334 334
335 void CreateFrames() { 335 void CreateFrames() {
336 int payload_size = arraysize(kPayload) - 1; 336 int payload_size = arraysize(kPayload) - 1;
337 int remaining_payload = payload_size; 337 int remaining_payload = payload_size;
338 while (remaining_payload != 0) { 338 while (remaining_payload != 0) {
339 int size = min(OneToN(6), remaining_payload); 339 int size = min(OneToN(6), remaining_payload);
340 int index = payload_size - remaining_payload; 340 int index = payload_size - remaining_payload;
341 list_.push_back(make_pair(index, string(kPayload + index, size))); 341 list_.push_back(std::make_pair(index, string(kPayload + index, size)));
342 remaining_payload -= size; 342 remaining_payload -= size;
343 } 343 }
344 } 344 }
345 345
346 QuicSequencerRandomTest() { 346 QuicSequencerRandomTest() {
347 CreateFrames(); 347 CreateFrames();
348 } 348 }
349 349
350 int OneToN(int n) { 350 int OneToN(int n) {
351 return base::RandInt(1, n); 351 return base::RandInt(1, n);
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 const int kNewDataLength = 3; 395 const int kNewDataLength = 3;
396 IOVector data = MakeIOVector(string(kNewDataLength, '.')); 396 IOVector data = MakeIOVector(string(kNewDataLength, '.'));
397 397
398 // No overlap if no buffered frames. 398 // No overlap if no buffered frames.
399 EXPECT_TRUE(buffered_frames_->empty()); 399 EXPECT_TRUE(buffered_frames_->empty());
400 EXPECT_FALSE(sequencer_->FrameOverlapsBufferedData( 400 EXPECT_FALSE(sequencer_->FrameOverlapsBufferedData(
401 QuicStreamFrame(1, false, kBufferedOffset - 1, data))); 401 QuicStreamFrame(1, false, kBufferedOffset - 1, data)));
402 402
403 // Add a buffered frame. 403 // Add a buffered frame.
404 buffered_frames->insert( 404 buffered_frames->insert(
405 make_pair(kBufferedOffset, string(kBufferedDataLength, '.'))); 405 std::make_pair(kBufferedOffset, string(kBufferedDataLength, '.')));
406 406
407 // New byte range partially overlaps with buffered frame, start offset 407 // New byte range partially overlaps with buffered frame, start offset
408 // preceeding buffered frame. 408 // preceeding buffered frame.
409 EXPECT_TRUE(sequencer_->FrameOverlapsBufferedData( 409 EXPECT_TRUE(sequencer_->FrameOverlapsBufferedData(
410 QuicStreamFrame(1, false, kBufferedOffset - 1, data))); 410 QuicStreamFrame(1, false, kBufferedOffset - 1, data)));
411 EXPECT_TRUE(sequencer_->FrameOverlapsBufferedData( 411 EXPECT_TRUE(sequencer_->FrameOverlapsBufferedData(
412 QuicStreamFrame(1, false, kBufferedOffset - kNewDataLength + 1, data))); 412 QuicStreamFrame(1, false, kBufferedOffset - kNewDataLength + 1, data)));
413 413
414 // New byte range partially overlaps with buffered frame, start offset 414 // New byte range partially overlaps with buffered frame, start offset
415 // inside existing buffered frame. 415 // inside existing buffered frame.
(...skipping 23 matching lines...) Expand all
439 QuicStreamFrame frame2(kClientDataStreamId1, false, 2, MakeIOVector("hello")); 439 QuicStreamFrame frame2(kClientDataStreamId1, false, 2, MakeIOVector("hello"));
440 EXPECT_TRUE(sequencer_->FrameOverlapsBufferedData(frame2)); 440 EXPECT_TRUE(sequencer_->FrameOverlapsBufferedData(frame2));
441 EXPECT_CALL(stream_, CloseConnectionWithDetails(QUIC_INVALID_STREAM_FRAME, _)) 441 EXPECT_CALL(stream_, CloseConnectionWithDetails(QUIC_INVALID_STREAM_FRAME, _))
442 .Times(1); 442 .Times(1);
443 sequencer_->OnStreamFrame(frame2); 443 sequencer_->OnStreamFrame(frame2);
444 } 444 }
445 445
446 } // namespace 446 } // namespace
447 } // namespace test 447 } // namespace test
448 } // namespace net 448 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/quic_stream_sequencer.cc ('k') | net/quic/quic_time_wait_list_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698