Remove most native WebContents references from Java

chrome/android/javatests/src/org/chromium/chrome/browser/prerender/ExternalPrerenderRequestTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/prerender/ExternalPrerenderRequestTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/prerender/ExternalPrerenderRequestTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/prerender/ExternalPrerenderRequestTest.java
index 401107e8faa49103cd57a6f09627ecc085592bc3..8beac5603fc67f958bbf7bc017c2a95e65d71967 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/prerender/ExternalPrerenderRequestTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/prerender/ExternalPrerenderRequestTest.java
@@ -10,12 +10,12 @@ import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.Feature;
-import org.chromium.chrome.browser.ContentViewUtil;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.shell.ChromeShellTestBase;
 import org.chromium.chrome.test.util.TestHttpServerClient;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
+import org.chromium.content_public.browser.WebContents;
 
 import java.util.concurrent.Callable;
 
@@ -71,18 +71,18 @@ public class ExternalPrerenderRequestTest extends ChromeShellTestBase {
      * Test adding a prerender and canceling that to add a new one.
      */
     public void testAddPrerenderAndCancel() throws InterruptedException {
-        long webContentsPtr = mHandler.addPrerender(mProfile, GOOGLE_URL, "", 0, 0);
+        WebContents webContents = mHandler.addPrerender(mProfile, GOOGLE_URL, "", 0, 0);
         assertTrue(ExternalPrerenderHandler.hasPrerenderedUrl(
-                mProfile, GOOGLE_URL, webContentsPtr));
+                mProfile, GOOGLE_URL, webContents));
 
         mHandler.cancelCurrentPrerender();
         assertFalse(ExternalPrerenderHandler.hasPrerenderedUrl(
-                mProfile, GOOGLE_URL, webContentsPtr));
-        ContentViewUtil.destroyNativeWebContents(webContentsPtr);
+                mProfile, GOOGLE_URL, webContents));
+        webContents.destroy();
         Thread.sleep(PRERENDER_DELAY_MS);
-        webContentsPtr = mHandler.addPrerender(mProfile, YOUTUBE_URL, "", 0, 0);
+        webContents = mHandler.addPrerender(mProfile, YOUTUBE_URL, "", 0, 0);
         assertTrue(ExternalPrerenderHandler.hasPrerenderedUrl(
-                mProfile, YOUTUBE_URL, webContentsPtr));
+                mProfile, YOUTUBE_URL, webContents));
 
     }
 
@@ -94,9 +94,9 @@ public class ExternalPrerenderRequestTest extends ChromeShellTestBase {
      */
     public void testCancelPrerender() {
         mHandler.cancelCurrentPrerender();
-        long webContentsPtr = mHandler.addPrerender(mProfile, GOOGLE_URL, "", 0, 0);
+        WebContents webContents = mHandler.addPrerender(mProfile, GOOGLE_URL, "", 0, 0);
         assertTrue(ExternalPrerenderHandler.hasPrerenderedUrl(
-                mProfile, GOOGLE_URL, webContentsPtr));
+                mProfile, GOOGLE_URL, webContents));
     }
 
     @MediumTest
@@ -106,12 +106,12 @@ public class ExternalPrerenderRequestTest extends ChromeShellTestBase {
      * Test adding two prerenders without canceling the first one.
      */
     public void testAddingPrerendersInaRow() throws InterruptedException {
-        long webContentsPtr = mHandler.addPrerender(mProfile, GOOGLE_URL, "", 0, 0);
+        WebContents webContents = mHandler.addPrerender(mProfile, GOOGLE_URL, "", 0, 0);
         assertTrue(ExternalPrerenderHandler.hasPrerenderedUrl(
-                mProfile, GOOGLE_URL, webContentsPtr));
+                mProfile, GOOGLE_URL, webContents));
         Thread.sleep(PRERENDER_DELAY_MS);
-        long newWebContentsPtr = mHandler.addPrerender(mProfile, YOUTUBE_URL, "", 0, 0);
+        WebContents newWebContents = mHandler.addPrerender(mProfile, YOUTUBE_URL, "", 0, 0);
         assertTrue(ExternalPrerenderHandler.hasPrerenderedUrl(
-                mProfile, YOUTUBE_URL, newWebContentsPtr));
+                mProfile, YOUTUBE_URL, newWebContents));
     }
 }