[reland] Routing IME Result Calls to the Correct RenderWidgetHost (Aura Only)

content/public/test/text_input_test_utils.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 "content/public/test/text_input_test_utils.h"
 
+#include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/browser/renderer_host/render_widget_host_view_base_observer.h"
 #include "content/browser/renderer_host/text_input_manager.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/text_input_state.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/test/test_utils.h"
@@ skipping 178 matching lines @@
   if (!manager || !manager->IsRegistered(view_base))
     return false;
 
   *type = manager->text_input_state_map_[view_base].type;
   return true;
 }
 
 RenderWidgetHostView* GetActiveViewFromWebContents(WebContents* web_contents) {
   return static_cast<WebContentsImpl*>(web_contents)
       ->GetTextInputManager()
-      ->GetActiveView();
+      ->active_view_for_testing();
 }
 
 TextInputManagerTester::TextInputManagerTester(WebContents* web_contents)
     : observer_(new InternalObserver(web_contents, this)) {}
 
 TextInputManagerTester::~TextInputManagerTester() {}
 
 void TextInputManagerTester::SetUpdateTextInputStateCalledCallback(
     const Callback& callback) {
   observer_->set_update_text_input_state_called_callback(callback);
@@ skipping 14 matching lines @@
   const TextInputState* state =
       observer_->text_input_manager()->GetTextInputState();
   if (!state)
     return false;
   *value = state->value;
   return true;
 }
 
 const RenderWidgetHostView* TextInputManagerTester::GetActiveView() {
   DCHECK(observer_->text_input_manager());
-  return observer_->text_input_manager()->GetActiveView();
+  return observer_->text_input_manager()->active_view_for_testing();
 }
 
 const RenderWidgetHostView* TextInputManagerTester::GetUpdatedView() {
   return observer_->GetUpdatedView();
 }
 
 bool TextInputManagerTester::IsTextInputStateChanged() {
   return observer_->text_input_state_changed();
 }
 
@@ skipping 65 matching lines @@
 
 #ifdef USE_AURA
   RenderWidgetHostViewAura* view = static_cast<RenderWidgetHostViewAura*>(
       web_contents->GetRenderWidgetHostView());
   observer.reset(new InputMethodObserverAura(view->GetInputMethod()));
 #endif
   return observer;
 }
 
 }  // namespace content