Blimp: Add BlobChannel Helium messages and delegate impls.

blimp/common/logging.cc

 // Copyright 2016 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 "blimp/common/logging.h"
 
 #include <iostream>
 #include <string>
 #include <vector>
 
 #include "base/format_macros.h"
 #include "base/json/string_escape.h"
 #include "base/lazy_instance.h"
 #include "base/memory/ptr_util.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
+#include "blimp/common/create_blimp_message.h"
 #include "blimp/common/proto/blimp_message.pb.h"
 
 namespace blimp {
 namespace {
 
 static base::LazyInstance<BlimpMessageLogger> g_logger =
     LAZY_INSTANCE_INITIALIZER;
 
 // The AddField() suite of functions are used to convert KV pairs with
 // arbitrarily typed values into string/string KV pairs for logging.
@@ skipping 214 matching lines @@
       case TabControlMessage::SIZE:
         AddField("subtype", "SIZE", output);
         AddField("size", message.tab_control().size(), output);
         break;
       default:  // unknown
         break;
     }
   }
 };
 
+// Logs fields from BLOB_CHANNEL messages.
+class BlobChannelLogExtractor : public LogExtractor {
+  void ExtractFields(const BlimpMessage& message,
+                     LogFields* output) const override {

[Wez, 2016/05/20 21:46:17]

nit: Want to log the payload size as well?

[Kevin M, 2016/05/23 20:48:07]

Done.

+    switch (message.blob_channel().type()) {
+      case BlobChannelMessage::TRANSFER_BLOB:
+        AddField("subtype", "TRANSFER_BLOB", output);
+      default:
+        break;
+    }
+    if (message.blob_channel().has_blob_id()) {
+      AddField("id", base::HexEncode(message.blob_channel().blob_id().data(),
+                                     message.blob_channel().blob_id().size()),
+               output);
+    }
+  }
+};
+
 // No fields are extracted from |message|.
 class NullLogExtractor : public LogExtractor {
   void ExtractFields(const BlimpMessage& message,
                      LogFields* output) const override {}
 };
 
 }  // namespace
 
 BlimpMessageLogger::BlimpMessageLogger() {
   AddHandler("COMPOSITOR", BlimpMessage::COMPOSITOR,
              base::WrapUnique(new CompositorLogExtractor));
   AddHandler("INPUT", BlimpMessage::INPUT,
              base::WrapUnique(new InputLogExtractor));
   AddHandler("NAVIGATION", BlimpMessage::NAVIGATION,
              base::WrapUnique(new NavigationLogExtractor));
   AddHandler("PROTOCOL_CONTROL", BlimpMessage::PROTOCOL_CONTROL,
              base::WrapUnique(new ProtocolControlLogExtractor));
   AddHandler("RENDER_WIDGET", BlimpMessage::RENDER_WIDGET,
              base::WrapUnique(new RenderWidgetLogExtractor));
   AddHandler("SETTINGS", BlimpMessage::SETTINGS,
              base::WrapUnique(new SettingsLogExtractor));
   AddHandler("TAB_CONTROL", BlimpMessage::TAB_CONTROL,
              base::WrapUnique(new TabControlLogExtractor));
+  AddHandler("BLOB_CHANNEL", BlimpMessage::BLOB_CHANNEL,
+             base::WrapUnique(new BlobChannelLogExtractor));
 }
 
 BlimpMessageLogger::~BlimpMessageLogger() {}
 
 void BlimpMessageLogger::AddHandler(const std::string& type_name,
                                     BlimpMessage::Type type,
                                     std::unique_ptr<LogExtractor> extractor) {
   DCHECK(extractors_.find(type) == extractors_.end());
   DCHECK(!type_name.empty());
   extractors_[type] = make_pair(type_name, std::move(extractor));
@@ skipping 30 matching lines @@
   }
   *out << ">";
 }
 
 std::ostream& operator<<(std::ostream& out, const BlimpMessage& message) {
   g_logger.Get().LogMessageToStream(message, &out);
   return out;
 }
 
 }  // namespace blimp