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

Unified Diff: net/http/http_stream_factory_impl_unittest.cc

Issue 699123002: Remove HttpStreamBase. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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
Index: net/http/http_stream_factory_impl_unittest.cc
diff --git a/net/http/http_stream_factory_impl_unittest.cc b/net/http/http_stream_factory_impl_unittest.cc
index 1efbd46873597ea309e5aea416907fc6de108fb8..22d0d2c9a1676d02c7e0fe0f87fc7d3a9a8db5ad 100644
--- a/net/http/http_stream_factory_impl_unittest.cc
+++ b/net/http/http_stream_factory_impl_unittest.cc
@@ -58,7 +58,7 @@ class MockWebSocketHandshakeStream : public WebSocketHandshakeStreamBase {
return type_;
}
- // HttpStreamBase methods
+ // HttpStream methods
int InitializeStream(const HttpRequestInfo* request_info,
RequestPriority priority,
const BoundNetLog& net_log,
@@ -93,6 +93,8 @@ class MockWebSocketHandshakeStream : public WebSocketHandshakeStreamBase {
bool IsSpdyHttpStream() const override { return false; }
void Drain(HttpNetworkSession* session) override {}
void SetPriority(RequestPriority priority) override {}
+ UploadProgress GetUploadProgress() const override { return UploadProgress(); }
+ HttpStream* RenewStreamForAuth() override { return nullptr; }
scoped_ptr<WebSocketStream> Upgrade() override {
return scoped_ptr<WebSocketStream>();
@@ -142,7 +144,7 @@ class StreamRequestWaiter : public HttpStreamRequest::Delegate {
void OnStreamReady(const SSLConfig& used_ssl_config,
const ProxyInfo& used_proxy_info,
- HttpStreamBase* stream) override {
+ HttpStream* stream) override {
stream_done_ = true;
if (waiting_for_stream_)
base::MessageLoop::current()->Quit();
@@ -180,7 +182,7 @@ class StreamRequestWaiter : public HttpStreamRequest::Delegate {
void OnHttpsProxyTunnelResponse(const HttpResponseInfo& response_info,
const SSLConfig& used_ssl_config,
const ProxyInfo& used_proxy_info,
- HttpStreamBase* stream) override {}
+ HttpStream* stream) override {}
void WaitForStream() {
while (!stream_done_) {
@@ -198,7 +200,7 @@ class StreamRequestWaiter : public HttpStreamRequest::Delegate {
return used_proxy_info_;
}
- HttpStreamBase* stream() {
+ HttpStream* stream() {
return stream_.get();
}
@@ -211,7 +213,7 @@ class StreamRequestWaiter : public HttpStreamRequest::Delegate {
private:
bool waiting_for_stream_;
bool stream_done_;
- scoped_ptr<HttpStreamBase> stream_;
+ scoped_ptr<HttpStream> stream_;
scoped_ptr<WebSocketHandshakeStreamBase> websocket_stream_;
SSLConfig used_ssl_config_;
ProxyInfo used_proxy_info_;

Powered by Google App Engine
This is Rietveld 408576698