Remove most native WebContents references from Java

android_webview/native/aw_settings.cc

 // Copyright (c) 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 "android_webview/native/aw_settings.h"
 
 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h"
 #include "android_webview/common/aw_content_client.h"
 #include "android_webview/native/aw_contents.h"
 #include "base/android/jni_android.h"
@@ skipping 52 matching lines @@
       return NULL;
     AwSettingsUserData* data = static_cast<AwSettingsUserData*>(
         web_contents->GetUserData(kAwSettingsUserDataKey));
     return data ? data->settings_ : NULL;
   }
 
  private:
   AwSettings* settings_;
 };
 
-AwSettings::AwSettings(JNIEnv* env, jobject obj, jlong web_contents)
-    : WebContentsObserver(
-          reinterpret_cast<content::WebContents*>(web_contents)),
+AwSettings::AwSettings(JNIEnv* env,
+                       jobject obj,
+                       content::WebContents* web_contents)
+    : WebContentsObserver(web_contents),
       renderer_prefs_initialized_(false),
       aw_settings_(env, obj) {
-  reinterpret_cast<content::WebContents*>(web_contents)->
-      SetUserData(kAwSettingsUserDataKey, new AwSettingsUserData(this));
+  web_contents->SetUserData(kAwSettingsUserDataKey,
+                            new AwSettingsUserData(this));
 }
 
 AwSettings::~AwSettings() {
   if (web_contents()) {
     web_contents()->SetUserData(kAwSettingsUserDataKey, NULL);
   }
 
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> scoped_obj = aw_settings_.get(env);
   jobject obj = scoped_obj.obj();
@@ skipping 310 matching lines @@
       Java_AwSettings_getAllowDisplayingInsecureContentLocked(env, obj);
   web_prefs->allow_running_insecure_content =
       Java_AwSettings_getAllowRunningInsecureContentLocked(env, obj);
 
   web_prefs->fullscreen_supported =
       Java_AwSettings_getFullscreenSupportedLocked(env, obj);
 }
 
 static jlong Init(JNIEnv* env,
                   jobject obj,
-                  jlong web_contents) {
-  AwSettings* settings = new AwSettings(env, obj, web_contents);
+                  jobject web_contents) {
+  content::WebContents* contents = content::WebContents::FromJavaWebContents(
+      web_contents);
+  AwSettings* settings = new AwSettings(env, obj, contents);
   return reinterpret_cast<intptr_t>(settings);
 }
 
 static jstring GetDefaultUserAgent(JNIEnv* env, jclass clazz) {
   return base::android::ConvertUTF8ToJavaString(env, GetUserAgent()).Release();
 }
 
 bool RegisterAwSettings(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android_webview