Merge ViewHostMsg_TextInputTypeChanged and ViewHostMsg_TextInputStateChanged into one.

content/browser/browser_plugin/browser_plugin_guest.cc

Index: content/browser/browser_plugin/browser_plugin_guest.cc
diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc
index 54c3f5d6e53d8355fcd8f3afdbdd437bde96071d..4371e4a636dfcaace619bba4479cc51b6f019ca8 100644
--- a/content/browser/browser_plugin/browser_plugin_guest.cc
+++ b/content/browser/browser_plugin/browser_plugin_guest.cc
@@ -566,8 +566,12 @@ void BrowserPluginGuest::SendTextInputTypeChangedToView(
     return;
   }
 
-  guest_rwhv->TextInputTypeChanged(last_text_input_type_, last_input_mode_,
-                                   last_can_compose_inline_, last_input_flags_);
+  ViewHostMsg_TextInputState_Params params;
+  params.type = last_text_input_type_;
+  params.mode = last_input_mode_;
+  params.flags = last_input_flags_;
+  params.can_compose_inline = last_can_compose_inline_;
+  guest_rwhv->TextInputStateChanged(params);
 }
 
 void BrowserPluginGuest::DidCommitProvisionalLoadForFrame(
@@ -643,8 +647,8 @@ bool BrowserPluginGuest::OnMessageReceived(const IPC::Message& message) {
     IPC_MESSAGE_HANDLER(ViewHostMsg_LockMouse, OnLockMouse)
     IPC_MESSAGE_HANDLER(ViewHostMsg_ShowWidget, OnShowWidget)
     IPC_MESSAGE_HANDLER(ViewHostMsg_TakeFocus, OnTakeFocus)
-    IPC_MESSAGE_HANDLER(ViewHostMsg_TextInputTypeChanged,
-                        OnTextInputTypeChanged)
+    IPC_MESSAGE_HANDLER(ViewHostMsg_TextInputStateChanged,
+                        OnTextInputStateChanged)
     IPC_MESSAGE_HANDLER(ViewHostMsg_UnlockMouse, OnUnlockMouse)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
@@ -959,15 +963,13 @@ void BrowserPluginGuest::OnTakeFocus(bool reverse) {
       new BrowserPluginMsg_AdvanceFocus(browser_plugin_instance_id(), reverse));
 }
 
-void BrowserPluginGuest::OnTextInputTypeChanged(ui::TextInputType type,
-                                                ui::TextInputMode input_mode,
-                                                bool can_compose_inline,
-                                                int flags) {
+void BrowserPluginGuest::OnTextInputStateChanged(
+    const ViewHostMsg_TextInputState_Params& params) {
   // Save the state of text input so we can restore it on focus.
-  last_text_input_type_ = type;
-  last_input_mode_ = input_mode;
-  last_input_flags_ = flags;
-  last_can_compose_inline_ = can_compose_inline;
+  last_text_input_type_ = params.type;
+  last_input_mode_ = params.mode;
+  last_input_flags_ = params.flags;
+  last_can_compose_inline_ = params.can_compose_inline;
 
   SendTextInputTypeChangedToView(
       static_cast<RenderWidgetHostViewBase*>(