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 1cd67ac225d2ba77cd6d7a7359a6569dd551cf71..e1c692b75c07e173392cf461ff89408ee627c3be 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;
@@ -227,6 +227,11 @@ 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> GetWeakPointer();

[boliu, 2017/04/04 23:19:32]

base already has GetWeakPtr. rename this to GetWeakPointerAndroid or something
like that? to avoid overloading

[Jinsuk Kim, 2017/04/04 23:26:50]

Done.

 
   void OnStartContentIntent(const GURL& content_url, bool is_main_frame);
 
@@ -236,8 +241,6 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
   void SetDoubleTapSupportEnabled(bool enabled);
   void SetMultiTouchZoomSupportEnabled(bool enabled);
 
-  long GetNativeImeAdapter();
-
   void WasResized();
 
   bool HasValidFrame() const;
@@ -272,7 +275,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;
@@ -347,7 +350,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_;