Revert "Refactor ContentViewClient (6/6)"

content/browser/renderer_host/render_widget_host_view_android.h

Index: content/browser/renderer_host/render_widget_host_view_android.h
diff --git a/content/browser/renderer_host/render_widget_host_view_android.h b/content/browser/renderer_host/render_widget_host_view_android.h
index cd3964b2c3a88cb611afff495b45073da8480865..5911166db0d1b3bbac7b4f4c437290dead767e47 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.h
+++ b/content/browser/renderer_host/render_widget_host_view_android.h
@@ -24,6 +24,7 @@
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/browser/android/content_view_core_impl_observer.h"
 #include "content/browser/renderer_host/delegated_frame_evictor.h"
+#include "content/browser/renderer_host/ime_adapter_android.h"
 #include "content/browser/renderer_host/input/stylus_text_selector.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/browser/renderer_host/text_input_manager.h"
@@ -48,7 +49,6 @@ struct DidOverscrollParams;
 
 namespace content {
 class ContentViewCoreImpl;
-class ImeAdapterAndroid;
 class OverscrollControllerAndroid;
 class RenderWidgetHost;
 class RenderWidgetHostImpl;
@@ -228,11 +228,6 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
   void ResolveTapDisambiguation(double timestamp_seconds,
                                 gfx::Point tap_viewport_offset,
                                 bool is_long_press);
-  void set_ime_adapter(ImeAdapterAndroid* ime_adapter) {
-    ime_adapter_android_ = ime_adapter;
-  }
-
-  base::WeakPtr<RenderWidgetHostViewAndroid> GetWeakPtrAndroid();
 
   bool OnTouchEvent(const ui::MotionEvent& event);
   bool OnTouchHandleEvent(const ui::MotionEvent& event);
@@ -240,6 +235,8 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
   void SetDoubleTapSupportEnabled(bool enabled);
   void SetMultiTouchZoomSupportEnabled(bool enabled);
 
+  long GetNativeImeAdapter();
+
   void WasResized();
 
   bool HasValidFrame() const;
@@ -274,7 +271,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
   void OnTextSelectionChanged(TextInputManager* text_input_manager,
                               RenderWidgetHostViewBase* updated_view) override;
 
-  ImeAdapterAndroid* ime_adapter_for_testing() { return ime_adapter_android_; }
+  ImeAdapterAndroid* ime_adapter_for_testing() { return &ime_adapter_android_; }
 
   // Exposed for tests.
   cc::SurfaceId SurfaceIdForTesting() const override;
@@ -349,7 +346,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
   // ContentViewCoreImpl is our interface to the view system.
   ContentViewCoreImpl* content_view_core_;
 
-  ImeAdapterAndroid* ime_adapter_android_;
+  ImeAdapterAndroid ime_adapter_android_;
 
   // The background color of the widget.
   SkColor background_color_;