[Blimp Engine] CL 1535903002 followup

Addresses wez's comment on patch set 4 of https://codereview.chromium.org/1535903002/

BUG=568276

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

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

3 files changed, 5 insertions, 12 deletions

diff --git a/blimp/engine/browser/blimp_engine_session.h b/blimp/engine/browser/blimp_engine_session.h
index e25d7df..3234b39 100644
--- a/blimp/engine/browser/blimp_engine_session.h
+++ b/blimp/engine/browser/blimp_engine_session.h
@@ -80,7 +80,7 @@ class BlimpEngineSession
   BlimpBrowserContext* browser_context() { return browser_context_.get(); }
 
   // BlimpMessageProcessor implementation.
-  // This object handles incoming TAB_CONTROL and NAVIGATION messages.
+  // This object handles incoming TAB_CONTROL and NAVIGATION messages directly.
   void ProcessMessage(scoped_ptr<BlimpMessage> message,
                       const net::CompletionCallback& callback) override;
 
@@ -165,8 +165,6 @@ class BlimpEngineSession
 
   // Handles all incoming and outgoing messages related to RenderWidget,
   // including INPUT, COMPOSITOR and RENDER_WIDGET messages.
-  // TODO(dtrainor, haibinlu): Move this to a higher level once we start dealing
-  // with multiple tabs.
   EngineRenderWidgetFeature render_widget_feature_;
 
   scoped_ptr<BlimpMessageProcessor> tab_control_message_sender_;
diff --git a/blimp/engine/browser/engine_render_widget_feature.cc b/blimp/engine/browser/engine_render_widget_feature.cc
index 7beaaaf..fe68ae6 100644
--- a/blimp/engine/browser/engine_render_widget_feature.cc
+++ b/blimp/engine/browser/engine_render_widget_feature.cc
@@ -100,7 +100,7 @@ void EngineRenderWidgetFeature::ProcessMessage(
     case BlimpMessage::INPUT:
       if (message->input().render_widget_id() == render_widget_id) {
         scoped_ptr<blink::WebInputEvent> event =
-            input_message_processor_.ProcessMessage(message->input());
+            input_message_converter_.ProcessMessage(message->input());
         if (event)
           delegate->OnWebInputEvent(std::move(event));
       }
diff --git a/blimp/engine/browser/engine_render_widget_feature.h b/blimp/engine/browser/engine_render_widget_feature.h
index 7f89516..b3504f47 100644
--- a/blimp/engine/browser/engine_render_widget_feature.h
+++ b/blimp/engine/browser/engine_render_widget_feature.h
@@ -13,7 +13,7 @@
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "blimp/net/blimp_message_processor.h"
-#include "blimp/net/input_message_processor.h"
+#include "blimp/net/input_message_converter.h"
 
 namespace blink {
 class WebInputEvent;
@@ -87,16 +87,11 @@ class EngineRenderWidgetFeature : public BlimpMessageProcessor {
   DelegateMap delegates_;
   RenderWidgetIdMap render_widget_ids_;
 
-  // TODO(haibinlu): rename InputMessageProcessor.
-  InputMessageProcessor input_message_processor_;
+  InputMessageConverter input_message_converter_;
 
-  // Message processor for sending RENDER_WIDGET messages.
+  // Outgoing message processors for RENDER_WIDGET, COMPOSITOR and INPUT types.
   scoped_ptr<BlimpMessageProcessor> render_widget_message_sender_;
-
-  // Message processor for sending COMPOSITOR messages.
   scoped_ptr<BlimpMessageProcessor> compositor_message_sender_;
-
-  // Message processor for sending INPUT messages.
   scoped_ptr<BlimpMessageProcessor> input_message_sender_;
 
   DISALLOW_COPY_AND_ASSIGN(EngineRenderWidgetFeature);