Move net/third_party/spdy code to a spdy:: namespace
Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: Ib454a13068fd760da17d0cceb1b2e2feebe4608d
Reviewed-on: https://chromium-review.googlesource.com/1064595
Reviewed-by: Misha Efimov <[email protected]>
Reviewed-by: Bence Béky <[email protected]>
Commit-Queue: Ryan Hamilton <[email protected]>
Cr-Commit-Position: refs/heads/master@{#560110}diff --git a/net/http/bidirectional_stream.h b/net/http/bidirectional_stream.h
index 69f26186..bf0f323 100644
--- a/net/http/bidirectional_stream.h
+++ b/net/http/bidirectional_stream.h
@@ -22,6 +22,10 @@
#include "net/http/http_stream_request.h"
#include "net/log/net_log_with_source.h"
+namespace spdy {
+class SpdyHeaderBlock;
+} // namespace spdy
+
namespace net {
class HttpAuthController;
@@ -29,7 +33,6 @@
class HttpStream;
class IOBuffer;
class ProxyInfo;
-class SpdyHeaderBlock;
struct BidirectionalStreamRequestInfo;
struct NetErrorDetails;
struct SSLConfig;
@@ -62,7 +65,8 @@
// The delegate may call BidirectionalStream::ReadData to start reading,
// call BidirectionalStream::SendData to send data,
// or call BidirectionalStream::Cancel to cancel the stream.
- virtual void OnHeadersReceived(const SpdyHeaderBlock& response_headers) = 0;
+ virtual void OnHeadersReceived(
+ const spdy::SpdyHeaderBlock& response_headers) = 0;
// Called when a pending read is completed asynchronously.
// |bytes_read| specifies how much data is read.
@@ -82,7 +86,7 @@
// are received, which can happen before a read completes.
// The delegate is able to continue reading if there is no pending read and
// EOF has not been received, or to send data if there is no pending send.
- virtual void OnTrailersReceived(const SpdyHeaderBlock& trailers) = 0;
+ virtual void OnTrailersReceived(const spdy::SpdyHeaderBlock& trailers) = 0;
// Called when an error occurred. Do not call into the stream after this
// point. No other delegate functions will be called after this.
@@ -179,10 +183,11 @@
void StartRequest(const SSLConfig& ssl_config);
// BidirectionalStreamImpl::Delegate implementation:
void OnStreamReady(bool request_headers_sent) override;
- void OnHeadersReceived(const SpdyHeaderBlock& response_headers) override;
+ void OnHeadersReceived(
+ const spdy::SpdyHeaderBlock& response_headers) override;
void OnDataRead(int bytes_read) override;
void OnDataSent() override;
- void OnTrailersReceived(const SpdyHeaderBlock& trailers) override;
+ void OnTrailersReceived(const spdy::SpdyHeaderBlock& trailers) override;
void OnFailed(int error) override;
// HttpStreamRequest::Delegate implementation:
