Land Recent QUIC Changes.

net/quic/test_tools/quic_test_writer.h

Index: net/quic/test_tools/quic_test_writer.h
diff --git a/net/quic/test_tools/quic_test_writer.h b/net/quic/test_tools/quic_test_writer.h
deleted file mode 100644
index 1fa655cb08e6f5bf46e336988997237acf70ea97..0000000000000000000000000000000000000000
--- a/net/quic/test_tools/quic_test_writer.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2013 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.
-
-#ifndef NET_QUIC_TEST_TOOLS_QUIC_TEST_WRITER_H_
-#define NET_QUIC_TEST_TOOLS_QUIC_TEST_WRITER_H_
-
-#include "base/memory/scoped_ptr.h"
-#include "net/quic/quic_packet_writer.h"
-
-namespace net {
-namespace test {
-
-// Allows setting a writer for a QuicConnection, to allow
-// fine-grained control of writes.
-class QuicTestWriter : public QuicPacketWriter {
- public:
-  QuicTestWriter();
-  virtual ~QuicTestWriter();
-
-  virtual bool IsWriteBlocked() const OVERRIDE;
-  virtual void SetWritable() OVERRIDE;
-
-  // Takes ownership of |writer|.
-  void set_writer(QuicPacketWriter* writer);
-
- protected:
-  QuicPacketWriter* writer();
-
- private:
-  scoped_ptr<QuicPacketWriter> writer_;
-};
-
-}  // namespace test
-}  // namespace net
-
-#endif  // NET_QUIC_TEST_TOOLS_QUIC_TEST_WRITER_H_