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

Unified Diff: net/socket/socket_test_util.cc

Issue 1124553002: Remove now unused OrderedSocketData. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix comments Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/socket/socket_test_util.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/socket_test_util.cc
diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc
index 20983aec00dcded9e6b009dc80261342db6cb444..6d6dea21d832f43f3ff1b05488f93ce89bf1bfa3 100644
--- a/net/socket/socket_test_util.cc
+++ b/net/socket/socket_test_util.cc
@@ -380,103 +380,6 @@ void DelayedSocketData::CompleteRead() {
socket()->OnReadComplete(OnRead());
}
-OrderedSocketData::OrderedSocketData(
- MockRead* reads, size_t reads_count, MockWrite* writes, size_t writes_count)
- : StaticSocketDataProvider(reads, reads_count, writes, writes_count),
- sequence_number_(0), loop_stop_stage_(0),
- blocked_(false), weak_factory_(this) {
-}
-
-OrderedSocketData::OrderedSocketData(
- const MockConnect& connect,
- MockRead* reads, size_t reads_count,
- MockWrite* writes, size_t writes_count)
- : StaticSocketDataProvider(reads, reads_count, writes, writes_count),
- sequence_number_(0), loop_stop_stage_(0),
- blocked_(false), weak_factory_(this) {
- set_connect_data(connect);
-}
-
-void OrderedSocketData::EndLoop() {
- // If we've already stopped the loop, don't do it again until we've advanced
- // to the next sequence_number.
- NET_TRACE(1, " *** ") << "Stage " << sequence_number_ << ": EndLoop()";
- if (loop_stop_stage_ > 0) {
- const MockRead& next_read = helper()->PeekRead();
- if ((next_read.sequence_number & ~MockRead::STOPLOOP) >
- loop_stop_stage_) {
- NET_TRACE(1, " *** ") << "Stage " << sequence_number_
- << ": Clearing stop index";
- loop_stop_stage_ = 0;
- } else {
- return;
- }
- }
- // Record the sequence_number at which we stopped the loop.
- NET_TRACE(1, " *** ") << "Stage " << sequence_number_
- << ": Posting Quit at read " << read_index();
- loop_stop_stage_ = sequence_number_;
-}
-
-MockRead OrderedSocketData::OnRead() {
- weak_factory_.InvalidateWeakPtrs();
- blocked_ = false;
- const MockRead& next_read = helper()->PeekRead();
- if (next_read.sequence_number & MockRead::STOPLOOP)
- EndLoop();
- if ((next_read.sequence_number & ~MockRead::STOPLOOP) <=
- sequence_number_++) {
- NET_TRACE(1, " *** ") << "Stage " << sequence_number_ - 1 << ": Read "
- << read_index();
- DumpMockReadWrite(next_read);
- blocked_ = (next_read.result == ERR_IO_PENDING);
- return StaticSocketDataProvider::OnRead();
- }
- NET_TRACE(1, " *** ") << "Stage " << sequence_number_ - 1 << ": I/O Pending";
- MockRead result = MockRead(ASYNC, ERR_IO_PENDING);
- DumpMockReadWrite(result);
- blocked_ = true;
- return result;
-}
-
-MockWriteResult OrderedSocketData::OnWrite(const std::string& data) {
- NET_TRACE(1, " *** ") << "Stage " << sequence_number_ << ": Write "
- << write_index();
- DumpMockReadWrite(helper()->PeekWrite());
- ++sequence_number_;
- if (blocked_) {
- // TODO(willchan): This 100ms delay seems to work around some weirdness. We
- // should probably fix the weirdness. One example is in SpdyStream,
- // DoSendRequest() will return ERR_IO_PENDING, and there's a race. If the
- // SYN_REPLY causes OnResponseReceived() to get called before
- // SpdyStream::ReadResponseHeaders() is called, we hit a NOTREACHED().
- base::MessageLoop::current()->PostDelayedTask(
- FROM_HERE,
- base::Bind(&OrderedSocketData::CompleteRead,
- weak_factory_.GetWeakPtr()),
- base::TimeDelta::FromMilliseconds(100));
- }
- return StaticSocketDataProvider::OnWrite(data);
-}
-
-void OrderedSocketData::Reset() {
- NET_TRACE(1, " *** ") << "Stage " << sequence_number_ << ": Reset()";
- sequence_number_ = 0;
- loop_stop_stage_ = 0;
- set_socket(NULL);
- weak_factory_.InvalidateWeakPtrs();
- StaticSocketDataProvider::Reset();
-}
-
-void OrderedSocketData::CompleteRead() {
- if (socket() && blocked_) {
- NET_TRACE(1, " *** ") << "Stage " << sequence_number_;
- socket()->OnReadComplete(OnRead());
- }
-}
-
-OrderedSocketData::~OrderedSocketData() {}
-
SequencedSocketData::SequencedSocketData(MockRead* reads,
size_t reads_count,
MockWrite* writes,
« no previous file with comments | « net/socket/socket_test_util.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698