Revert 268939 "Pass RenderFrameHost to WebContentObservers' mess..."

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

Index: trunk/src/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
===================================================================
--- trunk/src/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java	(revision 269074)
+++ trunk/src/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java	(working copy)
@@ -609,8 +609,7 @@
         };
 
         mNativeContentViewCore = nativeInit(
-                nativeWebContents, viewAndroidNativePointer, windowNativePointer,
-                mRetainedJavaScriptObjects);
+                nativeWebContents, viewAndroidNativePointer, windowNativePointer);
         mWebContents = nativeGetWebContentsAndroid(mNativeContentViewCore);
         mContentSettings = new ContentSettings(this, mNativeContentViewCore);
         initializeContainerView(internalDispatcher);
@@ -2703,7 +2702,8 @@
             Class<? extends Annotation> requiredAnnotation) {
         if (mNativeContentViewCore != 0 && object != null) {
             mJavaScriptInterfaces.put(name, object);
-            nativeAddJavascriptInterface(mNativeContentViewCore, object, name, requiredAnnotation);
+            nativeAddJavascriptInterface(mNativeContentViewCore, object, name, requiredAnnotation,
+                    mRetainedJavaScriptObjects);
         }
     }
 
@@ -3082,7 +3082,7 @@
     }
 
     private native long nativeInit(long webContentsPtr,
-            long viewAndroidPtr, long windowAndroidPtr, HashSet<Object> retainedObjectSet);
+            long viewAndroidPtr, long windowAndroidPtr);
 
     @CalledByNative
     private ContentVideoViewClient getContentVideoViewClient() {
@@ -3236,7 +3236,7 @@
             long nativeContentViewCoreImpl, boolean allow);
 
     private native void nativeAddJavascriptInterface(long nativeContentViewCoreImpl, Object object,
-            String name, Class requiredAnnotation);
+            String name, Class requiredAnnotation, HashSet<Object> retainedObjectSet);
 
     private native void nativeRemoveJavascriptInterface(long nativeContentViewCoreImpl,
             String name);