Commit ffe8aa32 authored by rch's avatar rch Committed by Commit bot

Remove now unused DelayedSocketData.

Review URL: https://codereview.chromium.org/1135833004

Cr-Commit-Position: refs/heads/master@{#330852}
parent 5b46c5cb
......@@ -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,
......
......@@ -333,54 +333,6 @@ struct SSLSocketDataProvider {
int connection_status;
};
// A DataProvider where the client must write a request before the reads (e.g.
// the response) will complete.
class DelayedSocketData : public StaticSocketDataProvider {
public:
// |write_delay| the number of MockWrites to complete before allowing
// a MockRead to complete.
// |reads| the list of MockRead completions.
// |writes| the list of MockWrite completions.
// Note: For stream sockets, the MockRead list must end with a EOF, e.g., a
// MockRead(true, 0, 0);
DelayedSocketData(int write_delay,
MockRead* reads,
size_t reads_count,
MockWrite* writes,
size_t writes_count);
// |connect| the result for the connect phase.
// |reads| the list of MockRead completions.
// |write_delay| the number of MockWrites to complete before allowing
// a MockRead to complete.
// |writes| the list of MockWrite completions.
// Note: For stream sockets, the MockRead list must end with a EOF, e.g., a
// MockRead(true, 0, 0);
DelayedSocketData(const MockConnect& connect,
int write_delay,
MockRead* reads,
size_t reads_count,
MockWrite* writes,
size_t writes_count);
~DelayedSocketData() override;
void ForceNextRead();
// StaticSocketDataProvider:
MockRead OnRead() override;
MockWriteResult OnWrite(const std::string& data) override;
void Reset() override;
void CompleteRead() override;
private:
int write_delay_;
bool read_in_progress_;
base::WeakPtrFactory<DelayedSocketData> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(DelayedSocketData);
};
// Uses the sequence_number field in the mock reads and writes to
// complete the operations in a specified order.
class SequencedSocketData : public SocketDataProvider {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment