Minor cleanup of QuicChromiumClientStreamTest

net/quic/chromium/quic_chromium_client_stream_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/chromium/quic_chromium_client_stream.h"
 
 #include <string>
 
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
@@ skipping 40 matching lines @@
   }
   MOCK_METHOD2(OnInitialHeadersAvailableMock,
                void(const SpdyHeaderBlock& headers, size_t frame_len));
   void OnTrailingHeadersAvailable(const SpdyHeaderBlock& headers,
                                   size_t frame_len) override {
     trailers_ = headers.Clone();
     OnTrailingHeadersAvailableMock(headers, frame_len);
   }
   MOCK_METHOD2(OnTrailingHeadersAvailableMock,
                void(const SpdyHeaderBlock& headers, size_t frame_len));
-  MOCK_METHOD2(OnDataReceived, int(const char*, int));
   MOCK_METHOD0(OnDataAvailable, void());
   MOCK_METHOD0(OnClose, void());
   MOCK_METHOD1(OnError, void(int));
   MOCK_METHOD0(HasSendHeadersComplete, bool());
 
   SpdyHeaderBlock headers_;
   SpdyHeaderBlock trailers_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockDelegate);
 };
 
-class TestQuicClientSessionBaseStream : public QuicSpdyStream {
- public:
-  TestQuicClientSessionBaseStream(QuicStreamId id, QuicSpdySession* session)
-      : QuicSpdyStream(id, session) {}
-
-  void OnDataAvailable() override {}
-};
-
 class MockQuicClientSessionBase : public QuicClientSessionBase {
  public:
   explicit MockQuicClientSessionBase(QuicConnection* connection,
                                      QuicClientPushPromiseIndex* index);
   ~MockQuicClientSessionBase() override;
 
   const QuicCryptoStream* GetCryptoStream() const override {
     return crypto_stream_.get();
   }
 
@@ skipping 50 matching lines @@
       WriteHeadersMock,
       size_t(QuicStreamId id,
              const SpdyHeaderBlock& headers,
              bool fin,
              SpdyPriority priority,
              const QuicReferenceCountedPointer<QuicAckListenerInterface>&
                  ack_listener));
   MOCK_METHOD1(OnHeadersHeadOfLineBlocking, void(QuicTime::Delta delta));
 
   std::unique_ptr<QuicStream> CreateStream(QuicStreamId id) {
-    return QuicMakeUnique<TestQuicClientSessionBaseStream>(id, this);
+    return QuicMakeUnique<QuicChromiumClientStream>(id, this,
+                                                    NetLogWithSource());
   }
 
   using QuicSession::ActivateStream;
 
   // Returns a QuicConsumedData that indicates all of |data| (and |fin| if set)
   // has been consumed.
   static QuicConsumedData ConsumeAllData(
       QuicStreamId id,
       const QuicIOVector& data,
       QuicStreamOffset offset,
@@ skipping 622 matching lines @@
   EXPECT_EQ(QuicStringPiece(data), QuicStringPiece(buffer->data(), data_len));
 
   // Both delegates should be notified that theirs streams are closed.
   EXPECT_CALL(delegate2_, OnClose());
   EXPECT_CALL(delegate_, OnClose());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net