Merge NOTIFICATION_RENDER_VIEW_HOST_CHANGED into NOTIFICATION_WEB_CONTENTS_SWAPPED.

content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java

Index: content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
index 4af9cc5d604be8fdee06bac329aa3ce8ec43ec66..6ed81ec447f917fed294221f76467e37aae75225 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
@@ -2559,17 +2559,13 @@ import java.util.Map;
         // renderers for ContentViews loading in background do not retain the high priority.
         ChildProcessLauncher.getBindingManager().removeInitialBinding(newPid);
         mPid = newPid;
-    }
 
-    @SuppressWarnings("unused")
-    @CalledByNative
-    private void onWebContentsConnected() {
         attachImeAdapter();
     }
 
     @SuppressWarnings("unused")
     @CalledByNative
-    private void onWebContentsSwapped() {
+    private void onWebContentsConnected() {
         attachImeAdapter();
     }