Add detailed logging support for BlimpMessage and subtypes.

Add detailed logging support for BlimpMessage and subtypes.
* Create FieldExtractor interface for classes which can extract
  loggable content from BlimpMessages.
* Implement FieldExtractors for most BlimpMessage types.
* Add BlimpMessageLogger class to manage FieldExtractors
  and serialize log messages.
* Add unit tests to verify log output of most BlimpMessage types.

R=dtrainor@chromium.org,haibinlu@chromium.org
BUG=

Review URL: https://codereview.chromium.org/1741943002

Cr-Commit-Position: refs/heads/master@{#378573}

9 files changed, 10 insertions, 22 deletions

diff --git a/blimp/net/BUILD.gn b/blimp/net/BUILD.gn
index 627b09b..aeafbae 100644
--- a/blimp/net/BUILD.gn
+++ b/blimp/net/BUILD.gn
@@ -105,6 +105,7 @@ source_set("unit_tests") {
     "//base",
     "//base/test:run_all_unittests",
     "//base/test:test_support",
+    "//blimp/common:blimp_common",
     "//blimp/common/proto",
     "//net:test_support",
     "//testing/gmock",
diff --git a/blimp/net/blimp_connection.cc b/blimp/net/blimp_connection.cc
index d2e2f78..ca6e178 100644
--- a/blimp/net/blimp_connection.cc
+++ b/blimp/net/blimp_connection.cc
@@ -9,6 +9,7 @@
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
+#include "blimp/common/logging.h"
 #include "blimp/common/proto/blimp_message.pb.h"
 #include "blimp/net/blimp_message_processor.h"
 #include "blimp/net/blimp_message_pump.h"
diff --git a/blimp/net/blimp_message_demultiplexer.cc b/blimp/net/blimp_message_demultiplexer.cc
index eb9edff..22189b4 100644
--- a/blimp/net/blimp_message_demultiplexer.cc
+++ b/blimp/net/blimp_message_demultiplexer.cc
@@ -7,6 +7,7 @@
 #include <string>
 
 #include "base/strings/stringprintf.h"
+#include "blimp/common/logging.h"
 #include "blimp/net/common.h"
 #include "net/base/net_errors.h"
 
diff --git a/blimp/net/blimp_message_output_buffer.cc b/blimp/net/blimp_message_output_buffer.cc
index 678acc3..cf194aa 100644
--- a/blimp/net/blimp_message_output_buffer.cc
+++ b/blimp/net/blimp_message_output_buffer.cc
@@ -8,6 +8,7 @@
 
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
+#include "blimp/common/logging.h"
 #include "blimp/common/proto/blimp_message.pb.h"
 #include "net/base/net_errors.h"
 
@@ -59,7 +60,7 @@ int BlimpMessageOutputBuffer::GetUnacknowledgedMessageCountForTest() const {
 void BlimpMessageOutputBuffer::ProcessMessage(
     scoped_ptr<BlimpMessage> message,
     const net::CompletionCallback& callback) {
-  DVLOG(2) << "OutputBuffer::ProcessMessage " << message.get();
+  DVLOG(2) << "OutputBuffer::ProcessMessage " << *message;
 
   message->set_message_id(++prev_message_id_);
 
diff --git a/blimp/net/blimp_message_pump.cc b/blimp/net/blimp_message_pump.cc
index 046df8e..37b084ee 100644
--- a/blimp/net/blimp_message_pump.cc
+++ b/blimp/net/blimp_message_pump.cc
@@ -5,6 +5,7 @@
 #include "blimp/net/blimp_message_pump.h"
 
 #include "base/macros.h"
+#include "blimp/common/logging.h"
 #include "blimp/common/proto/blimp_message.pb.h"
 #include "blimp/net/blimp_message_processor.h"
 #include "blimp/net/common.h"
diff --git a/blimp/net/common.cc b/blimp/net/common.cc
index 25eb09c..5a74de2 100644
--- a/blimp/net/common.cc
+++ b/blimp/net/common.cc
@@ -4,21 +4,9 @@
 
 #include "blimp/net/common.h"
 
-#include <iostream>
-
-#include "blimp/common/proto/blimp_message.pb.h"
-#include "net/base/ip_address_number.h"
-
 namespace blimp {
 
 const size_t kMaxPacketPayloadSizeBytes = 1024 * 1024;  // 1MB
 const size_t kPacketHeaderSizeBytes = 4;
 
-std::ostream& operator<<(std::ostream& out, const BlimpMessage& message) {
-  // TODO(kmarshall): Look into including type-specific fields in the output.
-  out << "<BlimpMessage type=" << message.type()
-      << ", size=" << message.ByteSize() << ">";
-  return out;
-}
-
 }  // namespace blimp
diff --git a/blimp/net/common.h b/blimp/net/common.h
index 2923104..4a7dda5 100644
--- a/blimp/net/common.h
+++ b/blimp/net/common.h
@@ -7,24 +7,15 @@
 
 #include <stddef.h>
 
-#include <string>
-
 #include "blimp/net/blimp_net_export.h"
-#include "net/base/ip_address_number.h"
 
 namespace blimp {
 
-class BlimpMessage;
-
 // TODO(kmarshall): Apply SCIENCE to determine a better constant here.
 // See crbug.com/542464
 extern const size_t BLIMP_NET_EXPORT kMaxPacketPayloadSizeBytes;
 extern const size_t BLIMP_NET_EXPORT kPacketHeaderSizeBytes;
 
-// Serializes human-readable BlimpMessage header info, for logging purposes.
-BLIMP_NET_EXPORT std::ostream& operator<<(std::ostream& out,
-                                          const BlimpMessage& message);
-
 }  // namespace blimp
 
 #endif  // BLIMP_NET_COMMON_H_
diff --git a/blimp/net/engine_authentication_handler.cc b/blimp/net/engine_authentication_handler.cc
index 41813fc..753438e 100644
--- a/blimp/net/engine_authentication_handler.cc
+++ b/blimp/net/engine_authentication_handler.cc
@@ -4,9 +4,12 @@
 
 #include "blimp/net/engine_authentication_handler.h"
 
+#include <string>
+
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/timer/timer.h"
+#include "blimp/common/logging.h"
 #include "blimp/common/proto/blimp_message.pb.h"
 #include "blimp/net/blimp_connection.h"
 #include "blimp/net/blimp_message_processor.h"
diff --git a/blimp/net/null_blimp_message_processor.cc b/blimp/net/null_blimp_message_processor.cc
index 3b335ac..40e9388 100644
--- a/blimp/net/null_blimp_message_processor.cc
+++ b/blimp/net/null_blimp_message_processor.cc
@@ -4,6 +4,7 @@
 
 #include "blimp/net/null_blimp_message_processor.h"
 
+#include "blimp/common/logging.h"
 #include "blimp/net/common.h"
 
 namespace blimp {