summaryrefslogtreecommitdiffstats
path: root/net/spdy
diff options
context:
space:
mode:
Diffstat (limited to 'net/spdy')
-rw-r--r--net/spdy/spdy_http_stream.cc10
-rw-r--r--net/spdy/spdy_http_stream.h10
-rw-r--r--net/spdy/spdy_http_stream_unittest.cc8
-rw-r--r--net/spdy/spdy_network_transaction_unittest.cc118
-rw-r--r--net/spdy/spdy_proxy_client_socket.cc16
-rw-r--r--net/spdy/spdy_proxy_client_socket.h12
-rw-r--r--net/spdy/spdy_proxy_client_socket_unittest.cc4
-rw-r--r--net/spdy/spdy_session.cc4
-rw-r--r--net/spdy/spdy_session.h14
-rw-r--r--net/spdy/spdy_session_unittest.cc12
-rw-r--r--net/spdy/spdy_stream_unittest.cc8
-rw-r--r--net/spdy/spdy_websocket_stream.h2
-rw-r--r--net/spdy/spdy_websocket_stream_unittest.cc10
13 files changed, 114 insertions, 114 deletions
diff --git a/net/spdy/spdy_http_stream.cc b/net/spdy/spdy_http_stream.cc
index ac0c4ce..474d497 100644
--- a/net/spdy/spdy_http_stream.cc
+++ b/net/spdy/spdy_http_stream.cc
@@ -50,7 +50,7 @@ SpdyHttpStream::~SpdyHttpStream() {
int SpdyHttpStream::InitializeStream(const HttpRequestInfo* request_info,
const BoundNetLog& stream_net_log,
- CompletionCallback* callback) {
+ OldCompletionCallback* callback) {
DCHECK(!stream_.get());
if (spdy_session_->IsClosed())
return ERR_CONNECTION_CLOSED;
@@ -82,7 +82,7 @@ uint64 SpdyHttpStream::GetUploadProgress() const {
return request_body_stream_->position();
}
-int SpdyHttpStream::ReadResponseHeaders(CompletionCallback* callback) {
+int SpdyHttpStream::ReadResponseHeaders(OldCompletionCallback* callback) {
CHECK(callback);
CHECK(!stream_->cancelled());
@@ -102,7 +102,7 @@ int SpdyHttpStream::ReadResponseHeaders(CompletionCallback* callback) {
}
int SpdyHttpStream::ReadResponseBody(
- IOBuffer* buf, int buf_len, CompletionCallback* callback) {
+ IOBuffer* buf, int buf_len, OldCompletionCallback* callback) {
CHECK(stream_->is_idle());
CHECK(buf);
CHECK(buf_len);
@@ -190,7 +190,7 @@ void SpdyHttpStream::set_chunk_callback(ChunkCallback* callback) {
int SpdyHttpStream::SendRequest(const HttpRequestHeaders& request_headers,
UploadDataStream* request_body,
HttpResponseInfo* response,
- CompletionCallback* callback) {
+ OldCompletionCallback* callback) {
base::Time request_time = base::Time::Now();
CHECK(stream_.get());
@@ -451,7 +451,7 @@ void SpdyHttpStream::DoCallback(int rv) {
CHECK(user_callback_);
// Since Run may result in being called back, clear user_callback_ in advance.
- CompletionCallback* c = user_callback_;
+ OldCompletionCallback* c = user_callback_;
user_callback_ = NULL;
c->Run(rv);
}
diff --git a/net/spdy/spdy_http_stream.h b/net/spdy/spdy_http_stream.h
index 4bb5d58..46a4104 100644
--- a/net/spdy/spdy_http_stream.h
+++ b/net/spdy/spdy_http_stream.h
@@ -46,17 +46,17 @@ class NET_EXPORT_PRIVATE SpdyHttpStream : public SpdyStream::Delegate,
// HttpStream methods:
virtual int InitializeStream(const HttpRequestInfo* request_info,
const BoundNetLog& net_log,
- CompletionCallback* callback) OVERRIDE;
+ OldCompletionCallback* callback) OVERRIDE;
virtual int SendRequest(const HttpRequestHeaders& headers,
UploadDataStream* request_body,
HttpResponseInfo* response,
- CompletionCallback* callback) OVERRIDE;
+ OldCompletionCallback* callback) OVERRIDE;
virtual uint64 GetUploadProgress() const OVERRIDE;
- virtual int ReadResponseHeaders(CompletionCallback* callback) OVERRIDE;
+ virtual int ReadResponseHeaders(OldCompletionCallback* callback) OVERRIDE;
virtual const HttpResponseInfo* GetResponseInfo() const;
virtual int ReadResponseBody(IOBuffer* buf,
int buf_len,
- CompletionCallback* callback) OVERRIDE;
+ OldCompletionCallback* callback) OVERRIDE;
virtual void Close(bool not_reusable) OVERRIDE;
virtual HttpStream* RenewStreamForAuth() OVERRIDE;
virtual bool IsResponseBodyComplete() const OVERRIDE;
@@ -118,7 +118,7 @@ class NET_EXPORT_PRIVATE SpdyHttpStream : public SpdyStream::Delegate,
// TODO(mbelshe): is this infinite buffering?
std::list<scoped_refptr<IOBufferWithSize> > response_body_;
- CompletionCallback* user_callback_;
+ OldCompletionCallback* user_callback_;
// User provided buffer for the ReadResponseBody() response.
scoped_refptr<IOBuffer> user_buffer_;
diff --git a/net/spdy/spdy_http_stream_unittest.cc b/net/spdy/spdy_http_stream_unittest.cc
index 9054e2b..4cafa32 100644
--- a/net/spdy/spdy_http_stream_unittest.cc
+++ b/net/spdy/spdy_http_stream_unittest.cc
@@ -32,7 +32,7 @@ class SpdyHttpStreamTest : public testing::Test {
session_ = http_session_->spdy_session_pool()->Get(pair, BoundNetLog());
transport_params_ = new TransportSocketParams(host_port_pair,
MEDIUM, GURL(), false, false);
- TestCompletionCallback callback;
+ TestOldCompletionCallback callback;
scoped_ptr<ClientSocketHandle> connection(new ClientSocketHandle);
EXPECT_EQ(ERR_IO_PENDING,
connection->Init(host_port_pair.ToString(),
@@ -73,7 +73,7 @@ TEST_F(SpdyHttpStreamTest, SendRequest) {
HttpRequestInfo request;
request.method = "GET";
request.url = GURL("http://www.google.com/");
- TestCompletionCallback callback;
+ TestOldCompletionCallback callback;
HttpResponseInfo response;
HttpRequestHeaders headers;
BoundNetLog net_log;
@@ -133,7 +133,7 @@ TEST_F(SpdyHttpStreamTest, SendChunkedPost) {
request.upload_data->set_is_chunked(true);
request.upload_data->AppendChunk(kUploadData, kUploadDataSize, false);
request.upload_data->AppendChunk(kUploadData, kUploadDataSize, true);
- TestCompletionCallback callback;
+ TestOldCompletionCallback callback;
HttpResponseInfo response;
HttpRequestHeaders headers;
BoundNetLog net_log;
@@ -187,7 +187,7 @@ TEST_F(SpdyHttpStreamTest, SpdyURLTest) {
HttpRequestInfo request;
request.method = "GET";
request.url = GURL(full_url);
- TestCompletionCallback callback;
+ TestOldCompletionCallback callback;
HttpResponseInfo response;
HttpRequestHeaders headers;
BoundNetLog net_log;
diff --git a/net/spdy/spdy_network_transaction_unittest.cc b/net/spdy/spdy_network_transaction_unittest.cc
index 5acd830..4a9e111 100644
--- a/net/spdy/spdy_network_transaction_unittest.cc
+++ b/net/spdy/spdy_network_transaction_unittest.cc
@@ -322,7 +322,7 @@ class SpdyNetworkTransactionTest
TransactionHelperResult output_;
scoped_ptr<StaticSocketDataProvider> first_transaction_;
SSLVector ssl_vector_;
- TestCompletionCallback callback;
+ TestOldCompletionCallback callback;
scoped_ptr<HttpNetworkTransaction> trans_;
scoped_ptr<HttpNetworkTransaction> trans_http_;
DataVector data_vector_;
@@ -406,7 +406,7 @@ class SpdyNetworkTransactionTest
int bytes_read = 0;
scoped_refptr<net::IOBufferWithSize> buf(new net::IOBufferWithSize(kSize));
- TestCompletionCallback callback;
+ TestOldCompletionCallback callback;
while (true) {
int rv = trans->Read(buf, kSize, &callback);
if (rv == ERR_IO_PENDING) {
@@ -456,7 +456,7 @@ class SpdyNetworkTransactionTest
HttpNetworkTransaction* trans = helper.trans();
// Start the transaction with basic parameters.
- TestCompletionCallback callback;
+ TestOldCompletionCallback callback;
int rv = trans->Start(&CreateGetRequest(), &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -668,9 +668,9 @@ TEST_P(SpdyNetworkTransactionTest, ThreeGets) {
scoped_ptr<HttpNetworkTransaction> trans3(
new HttpNetworkTransaction(helper.session()));
- TestCompletionCallback callback1;
- TestCompletionCallback callback2;
- TestCompletionCallback callback3;
+ TestOldCompletionCallback callback1;
+ TestOldCompletionCallback callback2;
+ TestOldCompletionCallback callback3;
HttpRequestInfo httpreq1 = CreateGetRequest();
HttpRequestInfo httpreq2 = CreateGetRequest();
@@ -753,8 +753,8 @@ TEST_P(SpdyNetworkTransactionTest, TwoGetsLateBinding) {
scoped_ptr<HttpNetworkTransaction> trans2(
new HttpNetworkTransaction(helper.session()));
- TestCompletionCallback callback1;
- TestCompletionCallback callback2;
+ TestOldCompletionCallback callback1;
+ TestOldCompletionCallback callback2;
HttpRequestInfo httpreq1 = CreateGetRequest();
HttpRequestInfo httpreq2 = CreateGetRequest();
@@ -842,8 +842,8 @@ TEST_P(SpdyNetworkTransactionTest, TwoGetsLateBindingFromPreconnect) {
scoped_ptr<HttpNetworkTransaction> trans2(
new HttpNetworkTransaction(helper.session()));
- TestCompletionCallback callback1;
- TestCompletionCallback callback2;
+ TestOldCompletionCallback callback1;
+ TestOldCompletionCallback callback2;
HttpRequestInfo httpreq = CreateGetRequest();
@@ -967,9 +967,9 @@ TEST_P(SpdyNetworkTransactionTest, ThreeGetsWithMaxConcurrent) {
scoped_ptr<HttpNetworkTransaction> trans3(
new HttpNetworkTransaction(helper.session()));
- TestCompletionCallback callback1;
- TestCompletionCallback callback2;
- TestCompletionCallback callback3;
+ TestOldCompletionCallback callback1;
+ TestOldCompletionCallback callback2;
+ TestOldCompletionCallback callback3;
HttpRequestInfo httpreq1 = CreateGetRequest();
HttpRequestInfo httpreq2 = CreateGetRequest();
@@ -1109,10 +1109,10 @@ TEST_P(SpdyNetworkTransactionTest, FourGetsWithMaxConcurrentPriority) {
scoped_ptr<HttpNetworkTransaction> trans4(
new HttpNetworkTransaction(helper.session()));
- TestCompletionCallback callback1;
- TestCompletionCallback callback2;
- TestCompletionCallback callback3;
- TestCompletionCallback callback4;
+ TestOldCompletionCallback callback1;
+ TestOldCompletionCallback callback2;
+ TestOldCompletionCallback callback3;
+ TestOldCompletionCallback callback4;
HttpRequestInfo httpreq1 = CreateGetRequest();
HttpRequestInfo httpreq2 = CreateGetRequest();
@@ -1243,9 +1243,9 @@ TEST_P(SpdyNetworkTransactionTest, ThreeGetsWithMaxConcurrentDelete) {
scoped_ptr<HttpNetworkTransaction> trans3(
new HttpNetworkTransaction(helper.session()));
- TestCompletionCallback callback1;
- TestCompletionCallback callback2;
- TestCompletionCallback callback3;
+ TestOldCompletionCallback callback1;
+ TestOldCompletionCallback callback2;
+ TestOldCompletionCallback callback3;
HttpRequestInfo httpreq1 = CreateGetRequest();
HttpRequestInfo httpreq2 = CreateGetRequest();
@@ -1293,7 +1293,7 @@ TEST_P(SpdyNetworkTransactionTest, ThreeGetsWithMaxConcurrentDelete) {
// The KillerCallback will delete the transaction on error as part of the
// callback.
-class KillerCallback : public TestCompletionCallback {
+class KillerCallback : public TestOldCompletionCallback {
public:
explicit KillerCallback(HttpNetworkTransaction* transaction)
: transaction_(transaction) {}
@@ -1301,7 +1301,7 @@ class KillerCallback : public TestCompletionCallback {
virtual void RunWithParams(const Tuple1<int>& params) {
if (params.a < 0)
delete transaction_;
- TestCompletionCallback::RunWithParams(params);
+ TestOldCompletionCallback::RunWithParams(params);
}
private:
@@ -1361,8 +1361,8 @@ TEST_P(SpdyNetworkTransactionTest, ThreeGetsWithMaxConcurrentSocketClose) {
HttpNetworkTransaction trans2(helper.session());
HttpNetworkTransaction* trans3(new HttpNetworkTransaction(helper.session()));
- TestCompletionCallback callback1;
- TestCompletionCallback callback2;
+ TestOldCompletionCallback callback1;
+ TestOldCompletionCallback callback2;
KillerCallback callback3(trans3);
HttpRequestInfo httpreq1 = CreateGetRequest();
@@ -1755,7 +1755,7 @@ TEST_P(SpdyNetworkTransactionTest, SocketWriteReturnsZero) {
helper.AddDeterministicData(data.get());
HttpNetworkTransaction* trans = helper.trans();
- TestCompletionCallback callback;
+ TestOldCompletionCallback callback;
int rv = trans->Start(&CreateGetRequest(), &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -1811,7 +1811,7 @@ TEST_P(SpdyNetworkTransactionTest, ResponseWithTwoSynReplies) {
HttpNetworkTransaction* trans = helper.trans();
- TestCompletionCallback callback;
+ TestOldCompletionCallback callback;
int rv = trans->Start(&helper.request(), &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -1906,7 +1906,7 @@ TEST_P(SpdyNetworkTransactionTest, WindowUpdateReceived) {
HttpNetworkTransaction* trans = helper.trans();
- TestCompletionCallback callback;
+ TestOldCompletionCallback callback;
int rv = trans->Start(&helper.request(), &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -1963,7 +1963,7 @@ TEST_P(SpdyNetworkTransactionTest, WindowUpdateSent) {
helper.RunPreTestSetup();
HttpNetworkTransaction* trans = helper.trans();
- TestCompletionCallback callback;
+ TestOldCompletionCallback callback;
int rv = trans->Start(&helper.request(), &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -2069,7 +2069,7 @@ TEST_P(SpdyNetworkTransactionTest, WindowUpdateOverflow) {
HttpNetworkTransaction* trans = helper.trans();
- TestCompletionCallback callback;
+ TestOldCompletionCallback callback;
int rv = trans->Start(&helper.request(), &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -2177,7 +2177,7 @@ TEST_P(SpdyNetworkTransactionTest, FlowControlStallResume) {
HttpNetworkTransaction* trans = helper.trans();
- TestCompletionCallback callback;
+ TestOldCompletionCallback callback;
int rv = trans->Start(&helper.request(), &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -2222,7 +2222,7 @@ TEST_P(SpdyNetworkTransactionTest, CancelledTransaction) {
helper.AddData(&data);
HttpNetworkTransaction* trans = helper.trans();
- TestCompletionCallback callback;
+ TestOldCompletionCallback callback;
int rv = trans->Start(&CreateGetRequest(), &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
helper.ResetTrans(); // Cancel the transaction.
@@ -2261,7 +2261,7 @@ TEST_P(SpdyNetworkTransactionTest, CancelledTransactionSendRst) {
helper.AddDeterministicData(data.get());
HttpNetworkTransaction* trans = helper.trans();
- TestCompletionCallback callback;
+ TestOldCompletionCallback callback;
int rv = trans->Start(&CreateGetRequest(), &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -2287,7 +2287,7 @@ class SpdyNetworkTransactionTest::StartTransactionCallback
virtual void RunWithParams(const Tuple1<int>& params) {
scoped_ptr<HttpNetworkTransaction> trans(
new HttpNetworkTransaction(session_));
- TestCompletionCallback callback;
+ TestOldCompletionCallback callback;
HttpRequestInfo request;
request.method = "GET";
request.url = GURL("http://www.google.com/");
@@ -2348,7 +2348,7 @@ TEST_P(SpdyNetworkTransactionTest, StartTransactionOnReadCallback) {
HttpNetworkTransaction* trans = helper.trans();
// Start the transaction with basic parameters.
- TestCompletionCallback callback;
+ TestOldCompletionCallback callback;
int rv = trans->Start(&helper.request(), &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -2406,7 +2406,7 @@ TEST_P(SpdyNetworkTransactionTest, DeleteSessionOnReadCallback) {
HttpNetworkTransaction* trans = helper.trans();
// Start the transaction with basic parameters.
- TestCompletionCallback callback;
+ TestOldCompletionCallback callback;
int rv = trans->Start(&helper.request(), &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -2813,7 +2813,7 @@ TEST_P(SpdyNetworkTransactionTest, ServerPushServerAborted) {
HttpNetworkTransaction* trans = helper.trans();
// Start the transaction with basic parameters.
- TestCompletionCallback callback;
+ TestOldCompletionCallback callback;
int rv = trans->Start(&CreateGetRequest(), &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -3067,7 +3067,7 @@ TEST_P(SpdyNetworkTransactionTest, ServerPushInvalidAssociatedStreamID0) {
HttpNetworkTransaction* trans = helper.trans();
// Start the transaction with basic parameters.
- TestCompletionCallback callback;
+ TestOldCompletionCallback callback;
int rv = trans->Start(&CreateGetRequest(), &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -3128,7 +3128,7 @@ TEST_P(SpdyNetworkTransactionTest, ServerPushInvalidAssociatedStreamID9) {
HttpNetworkTransaction* trans = helper.trans();
// Start the transaction with basic parameters.
- TestCompletionCallback callback;
+ TestOldCompletionCallback callback;
int rv = trans->Start(&CreateGetRequest(), &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -3185,7 +3185,7 @@ TEST_P(SpdyNetworkTransactionTest, ServerPushNoURL) {
HttpNetworkTransaction* trans = helper.trans();
// Start the transaction with basic parameters.
- TestCompletionCallback callback;
+ TestOldCompletionCallback callback;
int rv = trans->Start(&CreateGetRequest(), &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
@@ -3776,7 +3776,7 @@ TEST_P(SpdyNetworkTransactionTest, BufferFull) {
writes, arraysize(writes)));
- TestCompletionCallback callback;
+ TestOldCompletionCallback callback;
NormalSpdyTransactionHelper helper(CreateGetRequest(),
BoundNetLog(), GetParam());
@@ -3797,7 +3797,7 @@ TEST_P(SpdyNetworkTransactionTest, BufferFull) {
out.response_info = *response; // Make a copy so we can verify.
// Read Data
- TestCompletionCallback read_callback;
+ TestOldCompletionCallback read_callback;
std::string content;
do {
@@ -3873,7 +3873,7 @@ TEST_P(SpdyNetworkTransactionTest, Buffering) {
helper.AddData(data.get());
HttpNetworkTransaction* trans = helper.trans();
- TestCompletionCallback callback;
+ TestOldCompletionCallback callback;
int rv = trans->Start(&CreateGetRequest(), &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -3888,7 +3888,7 @@ TEST_P(SpdyNetworkTransactionTest, Buffering) {
out.response_info = *response; // Make a copy so we can verify.
// Read Data
- TestCompletionCallback read_callback;
+ TestOldCompletionCallback read_callback;
std::string content;
int reads_completed = 0;
@@ -3968,7 +3968,7 @@ TEST_P(SpdyNetworkTransactionTest, BufferedAll) {
helper.AddData(data.get());
HttpNetworkTransaction* trans = helper.trans();
- TestCompletionCallback callback;
+ TestOldCompletionCallback callback;
int rv = trans->Start(&CreateGetRequest(), &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -3983,7 +3983,7 @@ TEST_P(SpdyNetworkTransactionTest, BufferedAll) {
out.response_info = *response; // Make a copy so we can verify.
// Read Data
- TestCompletionCallback read_callback;
+ TestOldCompletionCallback read_callback;
std::string content;
int reads_completed = 0;
@@ -4056,7 +4056,7 @@ TEST_P(SpdyNetworkTransactionTest, BufferedClosed) {
helper.AddData(data.get());
HttpNetworkTransaction* trans = helper.trans();
- TestCompletionCallback callback;
+ TestOldCompletionCallback callback;
int rv = trans->Start(&CreateGetRequest(), &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -4072,7 +4072,7 @@ TEST_P(SpdyNetworkTransactionTest, BufferedClosed) {
out.response_info = *response; // Make a copy so we can verify.
// Read Data
- TestCompletionCallback read_callback;
+ TestOldCompletionCallback read_callback;
std::string content;
int reads_completed = 0;
@@ -4135,7 +4135,7 @@ TEST_P(SpdyNetworkTransactionTest, BufferedCancelled) {
helper.RunPreTestSetup();
helper.AddData(data.get());
HttpNetworkTransaction* trans = helper.trans();
- TestCompletionCallback callback;
+ TestOldCompletionCallback callback;
int rv = trans->Start(&CreateGetRequest(), &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -4151,7 +4151,7 @@ TEST_P(SpdyNetworkTransactionTest, BufferedCancelled) {
out.response_info = *response; // Make a copy so we can verify.
// Read Data
- TestCompletionCallback read_callback;
+ TestOldCompletionCallback read_callback;
do {
const int kReadSize = 256;
@@ -4440,7 +4440,7 @@ TEST_P(SpdyNetworkTransactionTest, CloseWithActiveStream) {
helper.AddData(data.get());
HttpNetworkTransaction* trans = helper.trans();
- TestCompletionCallback callback;
+ TestOldCompletionCallback callback;
TransactionHelperResult out;
out.rv = trans->Start(&CreateGetRequest(), &callback, log);
@@ -4533,7 +4533,7 @@ TEST_P(SpdyNetworkTransactionTest, ProxyConnect) {
}
helper.AddData(data.get());
- TestCompletionCallback callback;
+ TestOldCompletionCallback callback;
int rv = trans->Start(&CreateGetRequest(), &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -4593,7 +4593,7 @@ TEST_P(SpdyNetworkTransactionTest, DirectConnectProxyReconnect) {
helper.AddData(data.get());
HttpNetworkTransaction* trans = helper.trans();
- TestCompletionCallback callback;
+ TestOldCompletionCallback callback;
TransactionHelperResult out;
out.rv = trans->Start(&CreateGetRequest(), &callback, BoundNetLog());
@@ -4709,7 +4709,7 @@ TEST_P(SpdyNetworkTransactionTest, DirectConnectProxyReconnect) {
helper_proxy.AddData(data_proxy.get());
HttpNetworkTransaction* trans_proxy = helper_proxy.trans();
- TestCompletionCallback callback_proxy;
+ TestOldCompletionCallback callback_proxy;
int rv = trans_proxy->Start(&request_proxy, &callback_proxy, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback_proxy.WaitForResult();
@@ -4777,7 +4777,7 @@ TEST_P(SpdyNetworkTransactionTest, VerifyRetryOnConnectionReset) {
scoped_ptr<HttpNetworkTransaction> trans(
new HttpNetworkTransaction(helper.session()));
- TestCompletionCallback callback;
+ TestOldCompletionCallback callback;
int rv = trans->Start(&helper.request(), &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// On the second transaction, we trigger the RST.
@@ -4915,7 +4915,7 @@ TEST_P(SpdyNetworkTransactionTest, SpdyBasicAuth) {
helper.RunPreTestSetup();
helper.AddData(data.get());
HttpNetworkTransaction* trans = helper.trans();
- TestCompletionCallback callback_start;
+ TestOldCompletionCallback callback_start;
const int rv_start = trans->Start(&request, &callback_start, net_log);
EXPECT_EQ(ERR_IO_PENDING, rv_start);
const int rv_start_complete = callback_start.WaitForResult();
@@ -4936,7 +4936,7 @@ TEST_P(SpdyNetworkTransactionTest, SpdyBasicAuth) {
// Restart with a username/password.
const string16 kFoo(ASCIIToUTF16("foo"));
const string16 kBar(ASCIIToUTF16("bar"));
- TestCompletionCallback callback_restart;
+ TestOldCompletionCallback callback_restart;
const int rv_restart = trans->RestartWithAuth(kFoo, kBar, &callback_restart);
EXPECT_EQ(ERR_IO_PENDING, rv_restart);
const int rv_restart_complete = callback_restart.WaitForResult();
@@ -5118,7 +5118,7 @@ TEST_P(SpdyNetworkTransactionTest, ServerPushClaimBeforeHeaders) {
data->SetStop(3);
// Start the transaction.
- TestCompletionCallback callback;
+ TestOldCompletionCallback callback;
int rv = trans->Start(&CreateGetRequest(), &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
data->Run();
@@ -5267,7 +5267,7 @@ TEST_P(SpdyNetworkTransactionTest, ServerPushWithTwoHeaderFrames) {
data->SetStop(4);
// Start the transaction.
- TestCompletionCallback callback;
+ TestOldCompletionCallback callback;
int rv = trans->Start(&CreateGetRequest(), &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
data->Run();
@@ -5581,7 +5581,7 @@ TEST_P(SpdyNetworkTransactionTest, ServerPushCrossOriginCorrectness) {
HttpNetworkTransaction* trans = helper.trans();
// Start the transaction with basic parameters.
- TestCompletionCallback callback;
+ TestOldCompletionCallback callback;
int rv = trans->Start(&request, &callback, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
diff --git a/net/spdy/spdy_proxy_client_socket.cc b/net/spdy/spdy_proxy_client_socket.cc
index 5034d44..1b2674d 100644
--- a/net/spdy/spdy_proxy_client_socket.cc
+++ b/net/spdy/spdy_proxy_client_socket.cc
@@ -78,7 +78,7 @@ HttpStream* SpdyProxyClientSocket::CreateConnectResponseStream() {
// by creating a new stream for the subsequent request.
// TODO(rch): create a more appropriate error code to disambiguate
// the HTTPS Proxy tunnel failure from an HTTP Proxy tunnel failure.
-int SpdyProxyClientSocket::Connect(CompletionCallback* callback) {
+int SpdyProxyClientSocket::Connect(OldCompletionCallback* callback) {
DCHECK(!read_callback_);
if (next_state_ == STATE_OPEN)
return OK;
@@ -147,7 +147,7 @@ base::TimeDelta SpdyProxyClientSocket::GetConnectTimeMicros() const {
}
int SpdyProxyClientSocket::Read(IOBuffer* buf, int buf_len,
- CompletionCallback* callback) {
+ OldCompletionCallback* callback) {
DCHECK(!read_callback_);
DCHECK(!user_buffer_);
@@ -196,7 +196,7 @@ int SpdyProxyClientSocket::PopulateUserReadBuffer() {
}
int SpdyProxyClientSocket::Write(IOBuffer* buf, int buf_len,
- CompletionCallback* callback) {
+ OldCompletionCallback* callback) {
DCHECK(!write_callback_);
if (next_state_ == STATE_DISCONNECTED)
return ERR_SOCKET_NOT_CONNECTED;
@@ -264,7 +264,7 @@ void SpdyProxyClientSocket::OnIOComplete(int result) {
DCHECK_NE(STATE_DISCONNECTED, next_state_);
int rv = DoLoop(result);
if (rv != ERR_IO_PENDING) {
- CompletionCallback* c = read_callback_;
+ OldCompletionCallback* c = read_callback_;
read_callback_ = NULL;
c->Run(rv);
}
@@ -457,7 +457,7 @@ void SpdyProxyClientSocket::OnDataReceived(const char* data, int length) {
if (read_callback_) {
int rv = PopulateUserReadBuffer();
- CompletionCallback* c = read_callback_;
+ OldCompletionCallback* c = read_callback_;
read_callback_ = NULL;
user_buffer_ = NULL;
c->Run(rv);
@@ -475,7 +475,7 @@ void SpdyProxyClientSocket::OnDataSent(int length) {
int rv = write_buffer_len_;
write_buffer_len_ = 0;
write_bytes_outstanding_ = 0;
- CompletionCallback* c = write_callback_;
+ OldCompletionCallback* c = write_callback_;
write_callback_ = NULL;
c->Run(rv);
}
@@ -493,7 +493,7 @@ void SpdyProxyClientSocket::OnClose(int status) {
else
next_state_ = STATE_DISCONNECTED;
- CompletionCallback* write_callback = write_callback_;
+ OldCompletionCallback* write_callback = write_callback_;
write_callback_ = NULL;
write_buffer_len_ = 0;
write_bytes_outstanding_ = 0;
@@ -502,7 +502,7 @@ void SpdyProxyClientSocket::OnClose(int status) {
// we invoke the connect callback.
if (connecting) {
DCHECK(read_callback_);
- CompletionCallback* read_callback = read_callback_;
+ OldCompletionCallback* read_callback = read_callback_;
read_callback_ = NULL;
read_callback->Run(status);
} else if (read_callback_) {
diff --git a/net/spdy/spdy_proxy_client_socket.h b/net/spdy/spdy_proxy_client_socket.h
index 1b423c2..6f6e5a8 100644
--- a/net/spdy/spdy_proxy_client_socket.h
+++ b/net/spdy/spdy_proxy_client_socket.h
@@ -68,7 +68,7 @@ class NET_EXPORT_PRIVATE SpdyProxyClientSocket : public ProxyClientSocket,
virtual HttpStream* CreateConnectResponseStream();
// StreamSocket methods:
- virtual int Connect(CompletionCallback* callback);
+ virtual int Connect(OldCompletionCallback* callback);
virtual void Disconnect();
virtual bool IsConnected() const;
virtual bool IsConnectedAndIdle() const;
@@ -81,8 +81,8 @@ class NET_EXPORT_PRIVATE SpdyProxyClientSocket : public ProxyClientSocket,
virtual base::TimeDelta GetConnectTimeMicros() const;
// Socket methods:
- virtual int Read(IOBuffer* buf, int buf_len, CompletionCallback* callback);
- virtual int Write(IOBuffer* buf, int buf_len, CompletionCallback* callback);
+ virtual int Read(IOBuffer* buf, int buf_len, OldCompletionCallback* callback);
+ virtual int Write(IOBuffer* buf, int buf_len, OldCompletionCallback* callback);
virtual bool SetReceiveBufferSize(int32 size);
virtual bool SetSendBufferSize(int32 size);
virtual int GetPeerAddress(AddressList* address) const;
@@ -125,7 +125,7 @@ class NET_EXPORT_PRIVATE SpdyProxyClientSocket : public ProxyClientSocket,
// and returns the number of bytes read.
int PopulateUserReadBuffer();
- CompletionCallbackImpl<SpdyProxyClientSocket> io_callback_;
+ OldCompletionCallbackImpl<SpdyProxyClientSocket> io_callback_;
State next_state_;
// Pointer to the SPDY Stream that this sits on top of.
@@ -133,9 +133,9 @@ class NET_EXPORT_PRIVATE SpdyProxyClientSocket : public ProxyClientSocket,
// Stores the callback to the layer above, called on completing Read() or
// Connect().
- CompletionCallback* read_callback_;
+ OldCompletionCallback* read_callback_;
// Stores the callback to the layer above, called on completing Write().
- CompletionCallback* write_callback_;
+ OldCompletionCallback* write_callback_;
// CONNECT request and response.
HttpRequestInfo request_;
diff --git a/net/spdy/spdy_proxy_client_socket_unittest.cc b/net/spdy/spdy_proxy_client_socket_unittest.cc
index 9d1aaa6..c54e9c7 100644
--- a/net/spdy/spdy_proxy_client_socket_unittest.cc
+++ b/net/spdy/spdy_proxy_client_socket_unittest.cc
@@ -100,8 +100,8 @@ class SpdyProxyClientSocketTest : public PlatformTest {
}
scoped_ptr<SpdyProxyClientSocket> sock_;
- TestCompletionCallback read_callback_;
- TestCompletionCallback write_callback_;
+ TestOldCompletionCallback read_callback_;
+ TestOldCompletionCallback write_callback_;
scoped_refptr<DeterministicSocketData> data_;
private:
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index 317ec58..d4fcda5 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -351,7 +351,7 @@ int SpdySession::CreateStream(
RequestPriority priority,
scoped_refptr<SpdyStream>* spdy_stream,
const BoundNetLog& stream_net_log,
- CompletionCallback* callback) {
+ OldCompletionCallback* callback) {
if (!max_concurrent_streams_ ||
active_streams_.size() < max_concurrent_streams_) {
return CreateStreamImpl(url, priority, spdy_stream, stream_net_log);
@@ -1531,7 +1531,7 @@ void SpdySession::InvokeUserStreamCreationCallback(
if (it == pending_callback_map_.end())
return;
- CompletionCallback* callback = it->second.callback;
+ OldCompletionCallback* callback = it->second.callback;
int result = it->second.result;
pending_callback_map_.erase(it);
callback->Run(result);
diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h
index ad6ff84..c3711a1 100644
--- a/net/spdy/spdy_session.h
+++ b/net/spdy/spdy_session.h
@@ -84,7 +84,7 @@ class NET_EXPORT SpdySession : public base::RefCounted<SpdySession>,
RequestPriority priority,
scoped_refptr<SpdyStream>* spdy_stream,
const BoundNetLog& stream_net_log,
- CompletionCallback* callback);
+ OldCompletionCallback* callback);
// Remove PendingCreateStream objects on transaction deletion
void CancelPendingCreateStreams(const scoped_refptr<SpdyStream>* spdy_stream);
@@ -215,7 +215,7 @@ class NET_EXPORT SpdySession : public base::RefCounted<SpdySession>,
PendingCreateStream(const GURL& url, RequestPriority priority,
scoped_refptr<SpdyStream>* spdy_stream,
const BoundNetLog& stream_net_log,
- CompletionCallback* callback)
+ OldCompletionCallback* callback)
: url(&url), priority(priority), spdy_stream(spdy_stream),
stream_net_log(&stream_net_log), callback(callback) { }
@@ -223,7 +223,7 @@ class NET_EXPORT SpdySession : public base::RefCounted<SpdySession>,
RequestPriority priority;
scoped_refptr<SpdyStream>* spdy_stream;
const BoundNetLog* stream_net_log;
- CompletionCallback* callback;
+ OldCompletionCallback* callback;
};
typedef std::queue<PendingCreateStream, std::list< PendingCreateStream> >
PendingCreateStreamQueue;
@@ -234,10 +234,10 @@ class NET_EXPORT SpdySession : public base::RefCounted<SpdySession>,
struct CallbackResultPair {
CallbackResultPair() : callback(NULL), result(OK) {}
- CallbackResultPair(CompletionCallback* callback_in, int result_in)
+ CallbackResultPair(OldCompletionCallback* callback_in, int result_in)
: callback(callback_in), result(result_in) {}
- CompletionCallback* callback;
+ OldCompletionCallback* callback;
int result;
};
@@ -343,8 +343,8 @@ class NET_EXPORT SpdySession : public base::RefCounted<SpdySession>,
virtual void OnDataFrameHeader(const spdy::SpdyDataFrame* frame);
// Callbacks for the Spdy session.
- CompletionCallbackImpl<SpdySession> read_callback_;
- CompletionCallbackImpl<SpdySession> write_callback_;
+ OldCompletionCallbackImpl<SpdySession> read_callback_;
+ OldCompletionCallbackImpl<SpdySession> write_callback_;
// Used for posting asynchronous IO tasks. We use this even though
// SpdySession is refcounted because we don't need to keep the SpdySession
diff --git a/net/spdy/spdy_session_unittest.cc b/net/spdy/spdy_session_unittest.cc
index 9a0a2be..8d69fd3 100644
--- a/net/spdy/spdy_session_unittest.cc
+++ b/net/spdy/spdy_session_unittest.cc
@@ -147,7 +147,7 @@ class StreamReleaserCallback : public CallbackRunner<Tuple1<int> > {
scoped_refptr<SpdySession> session_;
scoped_refptr<SpdyStream> first_stream_;
scoped_refptr<SpdyStream> stream_;
- TestCompletionCallback callback_;
+ TestOldCompletionCallback callback_;
};
// TODO(kristianm): Could also test with more sessions where some are idle,
@@ -165,7 +165,7 @@ TEST_F(SpdySessionTest, CloseIdleSessions) {
scoped_refptr<SpdySession> session1 =
spdy_session_pool->Get(pair1, BoundNetLog());
scoped_refptr<SpdyStream> spdy_stream1;
- TestCompletionCallback callback1;
+ TestOldCompletionCallback callback1;
GURL url1(kTestHost1);
EXPECT_EQ(OK, session1->CreateStream(url1,
MEDIUM, /* priority, not important */
@@ -180,7 +180,7 @@ TEST_F(SpdySessionTest, CloseIdleSessions) {
scoped_refptr<SpdySession> session2 =
spdy_session_pool->Get(pair2, BoundNetLog());
scoped_refptr<SpdyStream> spdy_stream2;
- TestCompletionCallback callback2;
+ TestOldCompletionCallback callback2;
GURL url2(kTestHost2);
EXPECT_EQ(OK, session2->CreateStream(url2,
MEDIUM, /* priority, not important */
@@ -195,7 +195,7 @@ TEST_F(SpdySessionTest, CloseIdleSessions) {
scoped_refptr<SpdySession> session3 =
spdy_session_pool->Get(pair3, BoundNetLog());
scoped_refptr<SpdyStream> spdy_stream3;
- TestCompletionCallback callback3;
+ TestOldCompletionCallback callback3;
GURL url3(kTestHost3);
EXPECT_EQ(OK, session3->CreateStream(url3,
MEDIUM, /* priority, not important */
@@ -326,7 +326,7 @@ TEST_F(SpdySessionTest, OnSettings) {
// Create 2 streams. First will succeed. Second will be pending.
scoped_refptr<SpdyStream> spdy_stream1;
- TestCompletionCallback callback1;
+ TestOldCompletionCallback callback1;
GURL url("http://www.google.com");
EXPECT_EQ(OK,
session->CreateStream(url,
@@ -412,7 +412,7 @@ TEST_F(SpdySessionTest, CancelPendingCreateStream) {
// Use scoped_ptr to let us invalidate the memory when we want to, to trigger
// a valgrind error if the callback is invoked when it's not supposed to be.
- scoped_ptr<TestCompletionCallback> callback(new TestCompletionCallback);
+ scoped_ptr<TestOldCompletionCallback> callback(new TestOldCompletionCallback);
// Create 2 streams. First will succeed. Second will be pending.
scoped_refptr<SpdyStream> spdy_stream1;
diff --git a/net/spdy/spdy_stream_unittest.cc b/net/spdy/spdy_stream_unittest.cc
index 55ee198..78ffff5 100644
--- a/net/spdy/spdy_stream_unittest.cc
+++ b/net/spdy/spdy_stream_unittest.cc
@@ -19,7 +19,7 @@ class TestSpdyStreamDelegate : public SpdyStream::Delegate {
public:
TestSpdyStreamDelegate(SpdyStream* stream,
IOBufferWithSize* buf,
- CompletionCallback* callback)
+ OldCompletionCallback* callback)
: stream_(stream),
buf_(buf),
callback_(callback),
@@ -62,7 +62,7 @@ class TestSpdyStreamDelegate : public SpdyStream::Delegate {
}
virtual void OnClose(int status) {
closed_ = true;
- CompletionCallback* callback = callback_;
+ OldCompletionCallback* callback = callback_;
callback_ = NULL;
callback->Run(OK);
}
@@ -79,7 +79,7 @@ class TestSpdyStreamDelegate : public SpdyStream::Delegate {
private:
SpdyStream* stream_;
scoped_refptr<IOBufferWithSize> buf_;
- CompletionCallback* callback_;
+ OldCompletionCallback* callback_;
bool send_headers_completed_;
linked_ptr<spdy::SpdyHeaderBlock> response_;
std::string received_data_;
@@ -202,7 +202,7 @@ TEST_F(SpdyStreamTest, SendDataAfterOpen) {
session->CreateStream(url, LOWEST, &stream, BoundNetLog(), NULL));
scoped_refptr<IOBufferWithSize> buf(new IOBufferWithSize(8));
memcpy(buf->data(), "\0hello!\xff", 8);
- TestCompletionCallback callback;
+ TestOldCompletionCallback callback;
scoped_ptr<TestSpdyStreamDelegate> delegate(
new TestSpdyStreamDelegate(stream.get(), buf.get(), &callback));
diff --git a/net/spdy/spdy_websocket_stream.h b/net/spdy/spdy_websocket_stream.h
index 138c38e..686e7ca 100644
--- a/net/spdy/spdy_websocket_stream.h
+++ b/net/spdy/spdy_websocket_stream.h
@@ -89,7 +89,7 @@ class NET_EXPORT_PRIVATE SpdyWebSocketStream
scoped_refptr<SpdySession> spdy_session_;
Delegate* delegate_;
- CompletionCallbackImpl<SpdyWebSocketStream> spdy_stream_created_callback_;
+ OldCompletionCallbackImpl<SpdyWebSocketStream> spdy_stream_created_callback_;
DISALLOW_COPY_AND_ASSIGN(SpdyWebSocketStream);
};
diff --git a/net/spdy/spdy_websocket_stream_unittest.cc b/net/spdy/spdy_websocket_stream_unittest.cc
index 76ae76a..0644c96 100644
--- a/net/spdy/spdy_websocket_stream_unittest.cc
+++ b/net/spdy/spdy_websocket_stream_unittest.cc
@@ -48,7 +48,7 @@ namespace net {
class SpdyWebSocketStreamEventRecorder : public SpdyWebSocketStream::Delegate {
public:
- explicit SpdyWebSocketStreamEventRecorder(CompletionCallback* callback)
+ explicit SpdyWebSocketStreamEventRecorder(OldCompletionCallback* callback)
: callback_(callback) {}
virtual ~SpdyWebSocketStreamEventRecorder() {}
@@ -148,7 +148,7 @@ class SpdyWebSocketStreamEventRecorder : public SpdyWebSocketStream::Delegate {
scoped_ptr<Callback1<SpdyWebSocketStreamEvent*>::Type> on_sent_data_;
scoped_ptr<Callback1<SpdyWebSocketStreamEvent*>::Type> on_received_data_;
scoped_ptr<Callback1<SpdyWebSocketStreamEvent*>::Type> on_close_;
- CompletionCallback* callback_;
+ OldCompletionCallback* callback_;
DISALLOW_COPY_AND_ASSIGN(SpdyWebSocketStreamEventRecorder);
};
@@ -264,7 +264,7 @@ class SpdyWebSocketStreamTest : public testing::Test {
EXPECT_TRUE(spdy_session_pool->HasSession(host_port_proxy_pair_));
transport_params_ = new TransportSocketParams(host_port_pair_, MEDIUM,
GURL(), false, false);
- TestCompletionCallback callback;
+ TestOldCompletionCallback callback;
scoped_ptr<ClientSocketHandle> connection(new ClientSocketHandle);
EXPECT_EQ(ERR_IO_PENDING,
connection->Init(host_port_pair_.ToString(), transport_params_,
@@ -297,8 +297,8 @@ class SpdyWebSocketStreamTest : public testing::Test {
scoped_ptr<spdy::SpdyFrame> closing_frame_;
HostPortPair host_port_pair_;
HostPortProxyPair host_port_proxy_pair_;
- TestCompletionCallback completion_callback_;
- TestCompletionCallback sync_callback_;
+ TestOldCompletionCallback completion_callback_;
+ TestOldCompletionCallback sync_callback_;
static const char kMessageFrame[];
static const char kClosingFrame[];
generated by cgit v1.1 at 2025-02-09 19:22:25 +0000