Let ImeAdapterAndroid have the same lifecycle as its Java peer

content/browser/renderer_host/ime_adapter_android.h

Index: content/browser/renderer_host/ime_adapter_android.h
diff --git a/content/browser/renderer_host/ime_adapter_android.h b/content/browser/renderer_host/ime_adapter_android.h
index 72ab6d3ed3298b683e3aef302472a424f4de310f..0ad70fdeaa9021757b0e31c109b5dec5e7b73e05 100644
--- a/content/browser/renderer_host/ime_adapter_android.h
+++ b/content/browser/renderer_host/ime_adapter_android.h
@@ -10,6 +10,7 @@
 #include <vector>
 
 #include "base/android/jni_weak_ref.h"
+#include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "content/common/content_export.h"
 #include "ui/gfx/geometry/rect_f.h"
@@ -33,10 +34,12 @@ class RenderWidgetHostViewAndroid;
 // RenderWidgetHostViewAndroid).
 class CONTENT_EXPORT ImeAdapterAndroid {
  public:
-  explicit ImeAdapterAndroid(RenderWidgetHostViewAndroid* rwhva);
+  ImeAdapterAndroid(JNIEnv* env,
+                    const base::android::JavaParamRef<jobject>& obj);
   ~ImeAdapterAndroid();
 
   // Called from java -> native
+  void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
   bool SendKeyEvent(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>&,
@@ -60,9 +63,6 @@ class CONTENT_EXPORT ImeAdapterAndroid {
                   int relative_cursor_pos);
   void FinishComposingText(JNIEnv* env,
                            const base::android::JavaParamRef<jobject>&);
-  void AttachImeAdapter(
-      JNIEnv*,
-      const base::android::JavaParamRef<jobject>& java_object);
   void SetEditableSelectionOffsets(JNIEnv*,
                                    const base::android::JavaParamRef<jobject>&,
                                    int start,
@@ -80,12 +80,14 @@ class CONTENT_EXPORT ImeAdapterAndroid {
       const base::android::JavaParamRef<jobject>&,
       int before,
       int after);
-  void ResetImeAdapter(JNIEnv*, const base::android::JavaParamRef<jobject>&);
   void RequestCursorUpdate(JNIEnv*, const base::android::JavaParamRef<jobject>&,
                            bool immediateRequest, bool monitorRequest);
   bool RequestTextInputStateUpdate(JNIEnv*,
                                    const base::android::JavaParamRef<jobject>&);
 
+  void SetRenderWidgetHostViewAndroid(
+      const base::WeakPtr<RenderWidgetHostViewAndroid> rwhva);
+
   // Called from native -> java
   void CancelComposition();
   void FocusedNodeChanged(bool is_editable_node);
@@ -105,7 +107,7 @@ class CONTENT_EXPORT ImeAdapterAndroid {
       const base::android::JavaParamRef<jobject>& text,
       const base::string16& text16);
 
-  RenderWidgetHostViewAndroid* rwhva_;
+  base::WeakPtr<RenderWidgetHostViewAndroid> rwhva_;
   JavaObjectWeakGlobalRef java_ime_adapter_;
 };