Merge ViewHostMsg_TextInputTypeChanged and ViewHostMsg_TextInputStateChanged into one.

content/renderer/npapi/webplugin_delegate_proxy.cc

 // Copyright (c) 2012 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 "content/renderer/npapi/webplugin_delegate_proxy.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/basictypes.h"
@@ skipping 899 matching lines @@
 
   modal_loop_pump_messages_event_.reset(
       new base::WaitableEvent(modal_loop_pump_messages_event));
 }
 
 void WebPluginDelegateProxy::OnNotifyIMEStatus(int input_type,
                                                const gfx::Rect& caret_rect) {
   if (!render_view_)
     return;
 
-  render_view_->Send(new ViewHostMsg_TextInputTypeChanged(
-      render_view_->routing_id(),
-      static_cast<ui::TextInputType>(input_type),
-      ui::TEXT_INPUT_MODE_DEFAULT,
-      true));
+  ViewHostMsg_TextInputState_Params p;
+  p.type = static_cast<ui::TextInputType>(input_type);
+  p.mode = ui::TEXT_INPUT_MODE_DEFAULT;
+  p.can_compose_inline = true;
+
+  render_view_->Send(new ViewHostMsg_TextInputStateChanged(
+      render_view_->routing_id(), p));
 
   ViewHostMsg_SelectionBounds_Params bounds_params;
   bounds_params.anchor_rect = bounds_params.focus_rect = caret_rect;
   bounds_params.anchor_dir = bounds_params.focus_dir =
       blink::WebTextDirectionLeftToRight;
   bounds_params.is_anchor_first = true;
   render_view_->Send(new ViewHostMsg_SelectionBoundsChanged(
       render_view_->routing_id(),
       bounds_params));
 }
@@ skipping 299 matching lines @@
 
   plugin_->URLRedirectResponse(allow, resource_id);
 }
 
 void WebPluginDelegateProxy::OnCheckIfRunInsecureContent(const GURL& url,
                                                          bool* result) {
   *result = plugin_->CheckIfRunInsecureContent(url);
 }
 
 }  // namespace content