Remove most native WebContents references from Java

components/web_contents_delegate_android/web_contents_delegate_android.cc

 // Copyright (c) 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.
 
 #include "components/web_contents_delegate_android/web_contents_delegate_android.h"
 
 #include <android/keycodes.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 243 matching lines @@
 }
 
 void WebContentsDelegateAndroid::WebContentsCreated(
     WebContents* source_contents, int opener_render_frame_id,
     const base::string16& frame_name, const GURL& target_url,
     WebContents* new_contents) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);
   if (obj.is_null())
     return;
-  Java_WebContentsDelegateAndroid_webContentsCreated(env, obj.obj(),
-      reinterpret_cast<intptr_t>(source_contents),
+
+  ScopedJavaLocalRef<jobject> jsource_contents;
+  if (source_contents)
+    jsource_contents = source_contents->GetJavaWebContents();
+  ScopedJavaLocalRef<jobject> jnew_contents;
+  if (new_contents)
+    jnew_contents = new_contents->GetJavaWebContents();
+
+  Java_WebContentsDelegateAndroid_webContentsCreated(
+      env,
+      obj.obj(),
+      jsource_contents.obj(),
       opener_render_frame_id,
       base::android::ConvertUTF16ToJavaString(env, frame_name).Release(),
       base::android::ConvertUTF8ToJavaString(env, target_url.spec()).Release(),
-      reinterpret_cast<intptr_t>(new_contents));
+      jnew_contents.obj());
 }
 
 void WebContentsDelegateAndroid::CloseContents(WebContents* source) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);
   if (obj.is_null())
     return;
   Java_WebContentsDelegateAndroid_closeContents(env, obj.obj());
 }
 
@@ skipping 160 matching lines @@
 // Native JNI methods
 // ----------------------------------------------------------------------------
 
 // Register native methods
 
 bool RegisterWebContentsDelegateAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace web_contents_delegate_android