Let ImeAdapterAndroid have the same lifecycle as its Java peer

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 48a67128acc7ba105122f11dabe1f1a5553532fd..3add03ee01180fb54d5e41c572e52d063e6d8fb1 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.h
+++ b/content/browser/renderer_host/render_widget_host_view_android.h
@@ -24,7 +24,6 @@
 #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"
@@ -51,6 +50,7 @@ struct DidOverscrollParams;
 
 namespace content {
 class ContentViewCoreImpl;
+class ImeAdapterAndroid;
 class OverscrollControllerAndroid;
 class RenderWidgetHost;
 class RenderWidgetHostImpl;
@@ -222,6 +222,9 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
   void SendMouseEvent(const ui::MotionEventAndroid&, int action_button);
   void SendMouseWheelEvent(const blink::WebMouseWheelEvent& event);
   void SendGestureEvent(const blink::WebGestureEvent& event);
+  void set_ime_adapter(ImeAdapterAndroid* ime_adapter) {
+    ime_adapter_android_ = ime_adapter;
+  }
 
   void OnStartContentIntent(const GURL& content_url, bool is_main_frame);
 
@@ -231,8 +234,6 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
   void SetDoubleTapSupportEnabled(bool enabled);
   void SetMultiTouchZoomSupportEnabled(bool enabled);
 
-  long GetNativeImeAdapter();
-
   void WasResized();
 
   bool HasValidFrame() const;
@@ -267,7 +268,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;
@@ -350,7 +351,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_;
 
   // Body background color of the underlying document.
   SkColor cached_background_color_;