Remove unnessary usage of Tab.getNativePtr().

We shouldn't be asking for native pointers from java. All that was
needed was a WebContents, so use that directly.

getNativePtr isn't called anymore but can't be removed until the downstream
override is gone which needs this patch to roll down.

Review URL: https://codereview.chromium.org/941633003

Cr-Commit-Position: refs/heads/master@{#317089}

chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java

@@ -18,6 +18,7 @@ import android.widget.Toast;
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.CalledByNative;
 import org.chromium.chrome.R;
+import org.chromium.content_public.browser.WebContents;
 import org.chromium.content_public.common.ScreenOrientationConstants;
 
 import java.io.ByteArrayOutputStream;
@@ -70,7 +71,7 @@ public class ShortcutHelper {
      */
     public void initialize(OnInitialized callback) {
         mCallback = callback;
-        mNativeShortcutHelper = nativeInitialize(mTab.getNativePtr());
+        mNativeShortcutHelper = nativeInitialize(mTab.getWebContents());
     }
 
     /**
@@ -189,7 +190,7 @@ public class ShortcutHelper {
         }
     }
 
-    private native long nativeInitialize(long tabAndroidPtr);
+    private native long nativeInitialize(WebContents webContents);
     private native void nativeAddShortcut(long nativeShortcutHelper, String userRequestedTitle,
             int launcherLargeIconSize);
     private native void nativeTearDown(long nativeShortcutHelper);

chrome/browser/android/shortcut_helper.cc

@@ -16,7 +16,6 @@
 #include "base/task/cancelable_task_tracker.h"
 #include "base/threading/worker_pool.h"
 #include "chrome/browser/android/manifest_icon_selector.h"
-#include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/banners/app_banner_settings_helper.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
@@ -46,11 +45,10 @@ using content::Manifest;
 // http://developer.android.com/design/style/iconography.html
 const int ShortcutHelper::kPreferredIconSizeInDp = 48;
 
-jlong Initialize(JNIEnv* env, jobject obj, jlong tab_android_ptr) {
-  TabAndroid* tab = reinterpret_cast<TabAndroid*>(tab_android_ptr);
-
-  ShortcutHelper* shortcut_helper =
-      new ShortcutHelper(env, obj, tab->web_contents());
+jlong Initialize(JNIEnv* env, jobject obj, jobject java_web_contents) {
+  content::WebContents* web_contents =
+      content::WebContents::FromJavaWebContents(java_web_contents);
+  ShortcutHelper* shortcut_helper = new ShortcutHelper(env, obj, web_contents);
   shortcut_helper->Initialize();
 
   return reinterpret_cast<intptr_t>(shortcut_helper);