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

Unified Diff: net/socket/socket_test_util.cc

Issue 1135833004: Remove now unused DelayedSocketData (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 7 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 4ef64f91261173de6ae05628b335d5e63fb578c0..78c7ae0e65c31c18ff068272adc3e84b90919816 100644
--- a/net/socket/socket_test_util.cc
+++ b/net/socket/socket_test_util.cc
@@ -278,68 +278,6 @@ void SSLSocketDataProvider::SetNextProto(NextProto proto) {
next_proto = SSLClientSocket::NextProtoToString(proto);
}
-DelayedSocketData::DelayedSocketData(
- int write_delay, MockRead* reads, size_t reads_count,
- MockWrite* writes, size_t writes_count)
- : StaticSocketDataProvider(reads, reads_count, writes, writes_count),
- write_delay_(write_delay),
- read_in_progress_(false),
- weak_factory_(this) {
- DCHECK_GE(write_delay_, 0);
-}
-
-DelayedSocketData::DelayedSocketData(
- const MockConnect& connect, int write_delay, MockRead* reads,
- size_t reads_count, MockWrite* writes, size_t writes_count)
- : StaticSocketDataProvider(reads, reads_count, writes, writes_count),
- write_delay_(write_delay),
- read_in_progress_(false),
- weak_factory_(this) {
- DCHECK_GE(write_delay_, 0);
- set_connect_data(connect);
-}
-
-DelayedSocketData::~DelayedSocketData() {
-}
-
-void DelayedSocketData::ForceNextRead() {
- DCHECK(read_in_progress_);
- write_delay_ = 0;
- CompleteRead();
-}
-
-MockRead DelayedSocketData::OnRead() {
- MockRead out = MockRead(ASYNC, ERR_IO_PENDING);
- if (write_delay_ <= 0)
- out = StaticSocketDataProvider::OnRead();
- read_in_progress_ = (out.result == ERR_IO_PENDING);
- return out;
-}
-
-MockWriteResult DelayedSocketData::OnWrite(const std::string& data) {
- MockWriteResult rv = StaticSocketDataProvider::OnWrite(data);
- // Now that our write has completed, we can allow reads to continue.
- if (!--write_delay_ && read_in_progress_)
- base::MessageLoop::current()->PostDelayedTask(
- FROM_HERE,
- base::Bind(&DelayedSocketData::CompleteRead,
- weak_factory_.GetWeakPtr()),
- base::TimeDelta::FromMilliseconds(100));
- return rv;
-}
-
-void DelayedSocketData::Reset() {
- set_socket(NULL);
- read_in_progress_ = false;
- weak_factory_.InvalidateWeakPtrs();
- StaticSocketDataProvider::Reset();
-}
-
-void DelayedSocketData::CompleteRead() {
- if (socket() && read_in_progress_)
- socket()->OnReadComplete(OnRead());
-}
-
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