blimp: Add logging for compositor and render widget feature.

blimp/common/logging_unittest.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 <sstream>
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/strings/stringprintf.h"
 #include "blimp/common/logging.h"
@@ skipping 28 matching lines @@
 
  private:
   // Deletes the singleton on test termination.
   base::ShadowingAtExitManager at_exit_;
 };
 
 TEST_F(LoggingTest, Compositor) {
   BlimpMessage base_msg;
   base_msg.set_type(BlimpMessage::COMPOSITOR);
   base_msg.set_target_tab_id(kTargetTab);
-  VerifyLogOutput("type=COMPOSITOR target_tab_id=123", base_msg);
+  VerifyLogOutput("type=COMPOSITOR render_widget_id=0 target_tab_id=123",
+                  base_msg);
 }
 
 TEST_F(LoggingTest, Input) {
   BlimpMessage base_msg;
   base_msg.set_type(BlimpMessage::INPUT);
   base_msg.set_target_tab_id(kTargetTab);
-  VerifyLogOutput("type=INPUT target_tab_id=123", base_msg);
+  VerifyLogOutput("type=INPUT render_widget_id=0 target_tab_id=123", base_msg);
 }
 
 TEST_F(LoggingTest, Navigation) {
   BlimpMessage base_msg;
   base_msg.set_type(BlimpMessage::NAVIGATION);
   base_msg.set_target_tab_id(kTargetTab);
 
   BlimpMessage navigation_state_msg = base_msg;
   navigation_state_msg.mutable_navigation()->set_type(
       NavigationMessage::NAVIGATION_STATE_CHANGED);
@@ skipping 112 matching lines @@
                   created_msg);
 
   BlimpMessage deleted_msg = base_msg;
   deleted_msg.mutable_render_widget()->set_type(RenderWidgetMessage::DELETED);
   VerifyLogOutput("type=RENDER_WIDGET subtype=DELETED render_widget_id=123",
                   deleted_msg);
 }
 
 }  // namespace
 }  // namespace blimp