Revert of Let ImeAdapterAndroid have the same lifecycle as its Java peer

content/browser/android/content_view_core_impl.h

 // Copyright 2012 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.
 
 #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 155 matching lines @@
                              const base::android::JavaParamRef<jobject>& obj);
   void SetDoubleTapSupportEnabled(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj,
       jboolean enabled);
   void SetMultiTouchZoomSupportEnabled(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj,
       jboolean enabled);
 
+  long GetNativeImeAdapter(JNIEnv* env,
+                           const base::android::JavaParamRef<jobject>& obj);
   void SetFocus(JNIEnv* env,
                 const base::android::JavaParamRef<jobject>& obj,
                 jboolean focused);
 
   void SetDIPScale(JNIEnv* env,
                    const base::android::JavaParamRef<jobject>& obj,
                    jfloat dipScale);
 
   jint GetBackgroundColor(JNIEnv* env, jobject obj);
   void SetAllowJavascriptInterfacesInspection(
@@ skipping 72 matching lines @@
   void UpdateFrameInfo(const gfx::Vector2dF& scroll_offset,
                        float page_scale_factor,
                        const gfx::Vector2dF& page_scale_factor_limits,
                        const gfx::SizeF& content_size,
                        const gfx::SizeF& viewport_size,
                        const float top_controls_height,
                        const float top_controls_shown_ratio,
                        bool is_mobile_optimized_hint,
                        const gfx::SelectionBound& selection_start);
 
-  void UpdateImeAdapter(int text_input_type,
+  void ForceUpdateImeAdapter(long native_ime_adapter);
+  void UpdateImeAdapter(long native_ime_adapter,
+                        int text_input_type,
                         int text_input_flags,
                         int text_input_mode,
                         const std::string& text,
                         int selection_start,
                         int selection_end,
                         int composition_start,
                         int composition_end,
                         bool show_ime_if_needed,
                         bool reply_to_request);
 
@@ skipping 121 matching lines @@
   scoped_refptr<GinJavaBridgeDispatcherHost> java_bridge_dispatcher_host_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl);
 };
 
 bool RegisterContentViewCore(JNIEnv* env);
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_