Remove most native WebContents references from Java

content/shell/browser/shell_android.cc

 // Copyright 2013 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 "content/shell/browser/shell.h"
 
 #include <jni.h>
 
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_piece.h"
+#include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "content/shell/android/shell_manager.h"
 #include "jni/Shell_jni.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF8ToJavaString;
 
 namespace content {
 
 void Shell::PlatformInitialize(const gfx::Size& default_window_size) {
@@ skipping 27 matching lines @@
   Java_Shell_setIsLoading(env, java_object_.obj(), loading);
 }
 
 void Shell::PlatformCreateWindow(int width, int height) {
   java_object_.Reset(AttachCurrentThread(), CreateShellView(this));
 }
 
 void Shell::PlatformSetContents() {
   JNIEnv* env = AttachCurrentThread();
   Java_Shell_initFromNativeTabContents(
-      env, java_object_.obj(), reinterpret_cast<intptr_t>(web_contents()));
+      env, java_object_.obj(), web_contents()->GetJavaWebContents().obj());
 }
 
 void Shell::PlatformResizeSubViews() {
   // Not needed; subviews are bound.
 }
 
 void Shell::PlatformSetTitle(const base::string16& title) {
   NOTIMPLEMENTED() << ": " << title;
 }
 
@@ skipping 30 matching lines @@
   return RegisterNativesImpl(env);
 }
 
 // static
 void CloseShell(JNIEnv* env, jclass clazz, jlong shellPtr) {
   Shell* shell = reinterpret_cast<Shell*>(shellPtr);
   shell->Close();
 }
 
 }  // namespace content