Forward-declare QuicDecrypter and QuicEncrypter in quic_framer.h.

Use scoped_ptr for SimpleFramerVisitor in simple_quic_framer.h.
Remove the LOG(INFO) lines in SimpleQuicFramer::ProcessPacket.

Merge internal CL: 43147718

R=rch@chromium.org,rtenneti@chromium.org
BUG=none
TEST=none

Review URL: https://chromiumcodereview.appspot.com/12314142

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184898 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 26 insertions, 12 deletions

diff --git a/net/quic/quic_client_session_test.cc b/net/quic/quic_client_session_test.cc
index fbacd09..9e95366 100644
--- a/net/quic/quic_client_session_test.cc
+++ b/net/quic/quic_client_session_test.cc
@@ -11,6 +11,8 @@
 #include "net/base/net_log_unittest.h"
 #include "net/base/test_completion_callback.h"
 #include "net/quic/crypto/crypto_protocol.h"
+#include "net/quic/crypto/quic_decrypter.h"
+#include "net/quic/crypto/quic_encrypter.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 
 using testing::_;
diff --git a/net/quic/quic_connection.cc b/net/quic/quic_connection.cc
index c04c0dd..b61fd91 100644
--- a/net/quic/quic_connection.cc
+++ b/net/quic/quic_connection.cc
@@ -9,6 +9,8 @@
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "net/base/net_errors.h"
+#include "net/quic/crypto/quic_decrypter.h"
+#include "net/quic/crypto/quic_encrypter.h"
 #include "net/quic/quic_utils.h"
 
 using base::hash_map;
diff --git a/net/quic/quic_connection_helper_test.cc b/net/quic/quic_connection_helper_test.cc
index ea0637b..cc6288f 100644
--- a/net/quic/quic_connection_helper_test.cc
+++ b/net/quic/quic_connection_helper_test.cc
@@ -7,6 +7,8 @@
 #include <vector>
 
 #include "net/base/net_errors.h"
+#include "net/quic/crypto/quic_decrypter.h"
+#include "net/quic/crypto/quic_encrypter.h"
 #include "net/quic/test_tools/mock_clock.h"
 #include "net/quic/test_tools/quic_connection_peer.h"
 #include "net/quic/test_tools/quic_test_utils.h"
diff --git a/net/quic/quic_crypto_client_stream_test.cc b/net/quic/quic_crypto_client_stream_test.cc
index be53dc6..262b108 100644
--- a/net/quic/quic_crypto_client_stream_test.cc
+++ b/net/quic/quic_crypto_client_stream_test.cc
@@ -4,6 +4,8 @@
 
 #include "net/quic/quic_crypto_client_stream.h"
 
+#include "net/quic/crypto/quic_decrypter.h"
+#include "net/quic/crypto/quic_encrypter.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 
 using base::StringPiece;
diff --git a/net/quic/quic_framer.h b/net/quic/quic_framer.h
index 478f7b3..bcf551c 100644
--- a/net/quic/quic_framer.h
+++ b/net/quic/quic_framer.h
@@ -12,8 +12,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/string_piece.h"
 #include "net/base/net_export.h"
-#include "net/quic/crypto/quic_decrypter.h"
-#include "net/quic/crypto/quic_encrypter.h"
+#include "net/quic/quic_protocol.h"
 
 namespace net {
 
diff --git a/net/quic/quic_framer_test.cc b/net/quic/quic_framer_test.cc
index da1a665..a0170f2 100644
--- a/net/quic/quic_framer_test.cc
+++ b/net/quic/quic_framer_test.cc
@@ -12,6 +12,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/port.h"
 #include "base/stl_util.h"
+#include "net/quic/crypto/quic_decrypter.h"
+#include "net/quic/crypto/quic_encrypter.h"
 #include "net/quic/quic_framer.h"
 #include "net/quic/quic_protocol.h"
 #include "net/quic/quic_utils.h"
diff --git a/net/quic/quic_http_stream_test.cc b/net/quic/quic_http_stream_test.cc
index 5b4efaa..01b04be 100644
--- a/net/quic/quic_http_stream_test.cc
+++ b/net/quic/quic_http_stream_test.cc
@@ -13,6 +13,8 @@
 #include "net/http/http_response_headers.h"
 #include "net/quic/congestion_control/receive_algorithm_interface.h"
 #include "net/quic/congestion_control/send_algorithm_interface.h"
+#include "net/quic/crypto/quic_decrypter.h"
+#include "net/quic/crypto/quic_encrypter.h"
 #include "net/quic/quic_client_session.h"
 #include "net/quic/quic_connection.h"
 #include "net/quic/quic_connection_helper.h"
diff --git a/net/quic/quic_stream_factory_test.cc b/net/quic/quic_stream_factory_test.cc
index 09f6d7c..ca29264 100644
--- a/net/quic/quic_stream_factory_test.cc
+++ b/net/quic/quic_stream_factory_test.cc
@@ -10,6 +10,8 @@
 #include "net/http/http_response_headers.h"
 #include "net/http/http_response_info.h"
 #include "net/http/http_util.h"
+#include "net/quic/crypto/quic_decrypter.h"
+#include "net/quic/crypto/quic_encrypter.h"
 #include "net/quic/quic_http_stream.h"
 #include "net/quic/test_tools/mock_clock.h"
 #include "net/quic/test_tools/mock_random.h"
diff --git a/net/quic/test_tools/quic_test_utils.cc b/net/quic/test_tools/quic_test_utils.cc
index a96949c..ea15c97 100644
--- a/net/quic/test_tools/quic_test_utils.cc
+++ b/net/quic/test_tools/quic_test_utils.cc
@@ -7,6 +7,8 @@
 #include "base/stl_util.h"
 #include "net/quic/crypto/crypto_framer.h"
 #include "net/quic/crypto/crypto_utils.h"
+#include "net/quic/crypto/quic_decrypter.h"
+#include "net/quic/crypto/quic_encrypter.h"
 
 using std::max;
 using std::min;
diff --git a/net/quic/test_tools/simple_quic_framer.cc b/net/quic/test_tools/simple_quic_framer.cc
index 2ffd9ca..dc69642 100644
--- a/net/quic/test_tools/simple_quic_framer.cc
+++ b/net/quic/test_tools/simple_quic_framer.cc
@@ -4,6 +4,9 @@
 
 #include "net/quic/test_tools/simple_quic_framer.h"
 
+#include "net/quic/crypto/quic_decrypter.h"
+#include "net/quic/crypto/quic_encrypter.h"
+
 using base::StringPiece;
 using std::string;
 using std::vector;
@@ -110,25 +113,20 @@ class SimpleFramerVisitor : public QuicFramerVisitorInterface {
 };
 
 SimpleQuicFramer::SimpleQuicFramer()
-    : framer_(QuicDecrypter::Create(kNULL), QuicEncrypter::Create(kNULL)),
-      visitor_(NULL) {
+    : framer_(QuicDecrypter::Create(kNULL), QuicEncrypter::Create(kNULL)) {
 }
 
 SimpleQuicFramer::~SimpleQuicFramer() {
-  delete visitor_;
 }
 
 bool SimpleQuicFramer::ProcessPacket(const QuicPacket& packet) {
   scoped_ptr<QuicEncryptedPacket> encrypted(framer_.EncryptPacket(0, packet));
-  LOG(INFO) << __FUNCTION__ << encrypted.get();
-  LOG(INFO) << __FUNCTION__ << encrypted->length();
   return ProcessPacket(*encrypted);
 }
 
 bool SimpleQuicFramer::ProcessPacket(const QuicEncryptedPacket& packet) {
-  delete visitor_;
-  visitor_ = new SimpleFramerVisitor;
-  framer_.set_visitor(visitor_);
+  visitor_.reset(new SimpleFramerVisitor);
+  framer_.set_visitor(visitor_.get());
   return framer_.ProcessPacket(packet);
 }
 
diff --git a/net/quic/test_tools/simple_quic_framer.h b/net/quic/test_tools/simple_quic_framer.h
index f794270..a1ffd3d 100644
--- a/net/quic/test_tools/simple_quic_framer.h
+++ b/net/quic/test_tools/simple_quic_framer.h
@@ -7,6 +7,7 @@
 
 #include <vector>
 
+#include "base/memory/scoped_ptr.h"
 #include "net/quic/quic_framer.h"
 #include "net/quic/quic_protocol.h"
 
@@ -23,7 +24,7 @@ namespace test {
 
 class SimpleFramerVisitor;
 
-// Peer to make public a number of otherwise private QuicConnection methods.
+// Peer to make public a number of otherwise private QuicFramer methods.
 class SimpleQuicFramer {
  public:
   SimpleQuicFramer();
@@ -44,7 +45,7 @@ class SimpleQuicFramer {
 
  private:
   QuicFramer framer_;
-  SimpleFramerVisitor* visitor_;
+  scoped_ptr<SimpleFramerVisitor> visitor_;
   DISALLOW_COPY_AND_ASSIGN(SimpleQuicFramer);
 };