5 files changed, 12 insertions, 12 deletions
diff --git a/net/quic/bidirectional_stream_quic_impl.cc b/net/quic/bidirectional_stream_quic_impl.cc
index bd2812e..6e56032 100644
--- a/net/quic/bidirectional_stream_quic_impl.cc
+++ b/net/quic/bidirectional_stream_quic_impl.cc
@@ -45,7 +45,7 @@ BidirectionalStreamQuicImpl::~BidirectionalStreamQuicImpl() {
 void BidirectionalStreamQuicImpl::Start(
     const BidirectionalStreamRequestInfo* request_info,
     const BoundNetLog& net_log,
-    BidirectionalStreamJob::Delegate* delegate,
+    BidirectionalStreamImpl::Delegate* delegate,
     scoped_ptr<base::Timer> /* timer */) {
   DCHECK(!stream_);
 
diff --git a/net/quic/bidirectional_stream_quic_impl.h b/net/quic/bidirectional_stream_quic_impl.h
index bfc39a6..b75c389 100644
--- a/net/quic/bidirectional_stream_quic_impl.h
+++ b/net/quic/bidirectional_stream_quic_impl.h
@@ -10,7 +10,7 @@
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "net/http/bidirectional_stream_job.h"
+#include "net/http/bidirectional_stream_impl.h"
 #include "net/quic/quic_chromium_client_session.h"
 #include "net/quic/quic_chromium_client_stream.h"
 
@@ -26,7 +26,7 @@ class IOBuffer;
 class SpdyHeaderBlock;
 
 class NET_EXPORT_PRIVATE BidirectionalStreamQuicImpl
-    : public BidirectionalStreamJob,
+    : public BidirectionalStreamImpl,
       public QuicChromiumClientStream::Delegate,
       public QuicChromiumClientSession::Observer {
  public:
@@ -35,10 +35,10 @@ class NET_EXPORT_PRIVATE BidirectionalStreamQuicImpl
 
   ~BidirectionalStreamQuicImpl() override;
 
-  // BidirectionalStreamJob implementation:
+  // BidirectionalStreamImpl implementation:
   void Start(const BidirectionalStreamRequestInfo* request_info,
              const BoundNetLog& net_log,
-             BidirectionalStreamJob::Delegate* delegate,
+             BidirectionalStreamImpl::Delegate* delegate,
              scoped_ptr<base::Timer> timer) override;
   int ReadData(IOBuffer* buffer, int buffer_len) override;
   void SendData(IOBuffer* data, int length, bool end_stream) override;
@@ -77,7 +77,7 @@ class NET_EXPORT_PRIVATE BidirectionalStreamQuicImpl
   QuicChromiumClientStream* stream_;  // Non-owning.
 
   const BidirectionalStreamRequestInfo* request_info_;
-  BidirectionalStreamJob::Delegate* delegate_;
+  BidirectionalStreamImpl::Delegate* delegate_;
   // Saves the response status if the stream is explicitly closed via OnError
   // or OnClose with an error. Once all buffered data has been returned, this
   // will be used as the final response.
diff --git a/net/quic/bidirectional_stream_quic_impl_unittest.cc b/net/quic/bidirectional_stream_quic_impl_unittest.cc
index 3f38f5c..dcf45e4 100644
--- a/net/quic/bidirectional_stream_quic_impl_unittest.cc
+++ b/net/quic/bidirectional_stream_quic_impl_unittest.cc
@@ -51,7 +51,7 @@ const uint16_t kDefaultServerPort = 80;
 // Size of the buffer to be allocated for each read.
 const size_t kReadBufferSize = 4096;
 
-class TestDelegateBase : public BidirectionalStreamJob::Delegate {
+class TestDelegateBase : public BidirectionalStreamImpl::Delegate {
  public:
   TestDelegateBase(IOBuffer* read_buf, int read_buf_len)
       : TestDelegateBase(read_buf,
diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc
index 4bb26f9..a550bd9 100644
--- a/net/quic/quic_stream_factory.cc
+++ b/net/quic/quic_stream_factory.cc
@@ -28,7 +28,7 @@
 #include "net/cert/ct_verifier.h"
 #include "net/dns/host_resolver.h"
 #include "net/dns/single_request_host_resolver.h"
-#include "net/http/bidirectional_stream_job.h"
+#include "net/http/bidirectional_stream_impl.h"
 #include "net/quic/bidirectional_stream_quic_impl.h"
 #include "net/quic/crypto/channel_id_chromium.h"
 #include "net/quic/crypto/proof_verifier_chromium.h"
@@ -557,8 +557,8 @@ scoped_ptr<QuicHttpStream> QuicStreamRequest::CreateStream() {
   return make_scoped_ptr(new QuicHttpStream(session_));
 }
 
-scoped_ptr<BidirectionalStreamJob>
-QuicStreamRequest::CreateBidirectionalStreamJob() {
+scoped_ptr<BidirectionalStreamImpl>
+QuicStreamRequest::CreateBidirectionalStreamImpl() {
   if (!session_)
     return nullptr;
   return make_scoped_ptr(new BidirectionalStreamQuicImpl(session_));
diff --git a/net/quic/quic_stream_factory.h b/net/quic/quic_stream_factory.h
index 9030779..9bbf995 100644
--- a/net/quic/quic_stream_factory.h
+++ b/net/quic/quic_stream_factory.h
@@ -56,7 +56,7 @@ class QuicServerInfoFactory;
 class QuicStreamFactory;
 class SocketPerformanceWatcherFactory;
 class TransportSecurityState;
-class BidirectionalStreamJob;
+class BidirectionalStreamImpl;
 
 namespace test {
 class QuicStreamFactoryPeer;
@@ -91,7 +91,7 @@ class NET_EXPORT_PRIVATE QuicStreamRequest {
 
   scoped_ptr<QuicHttpStream> CreateStream();
 
-  scoped_ptr<BidirectionalStreamJob> CreateBidirectionalStreamJob();
+  scoped_ptr<BidirectionalStreamImpl> CreateBidirectionalStreamImpl();
 
   // Sets |session_|.
   void SetSession(QuicChromiumClientSession* session);