Remove most native WebContents references from Java

chrome/browser/android/chrome_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 "chrome/browser/android/chrome_web_contents_delegate_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/command_line.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 304 matching lines @@
   DCHECK_NE(disposition, SAVE_TO_DISK);
   // Can't create a new contents for the current tab - invalid case.
   DCHECK_NE(disposition, CURRENT_TAB);
 
   TabHelpers::AttachTabHelpers(new_contents);
 
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);
   bool handled = false;
   if (!obj.is_null()) {
+    ScopedJavaLocalRef<jobject> jsource;
+    if (source)
+      jsource = source->GetJavaWebContents();
+    ScopedJavaLocalRef<jobject> jnew_contents;
+    if (new_contents)
+      jnew_contents = new_contents->GetJavaWebContents();
+
     handled = Java_ChromeWebContentsDelegateAndroid_addNewContents(
         env,
         obj.obj(),
-        reinterpret_cast<intptr_t>(source),
-        reinterpret_cast<intptr_t>(new_contents),
+        jsource.obj(),
+        jnew_contents.obj(),
         static_cast<jint>(disposition),
         NULL,
         user_gesture);
   }
 
   if (was_blocked)
     *was_blocked = !handled;
   if (!handled)
     delete new_contents;
 }
 
 }  // namespace android
 }  // namespace chrome