Move the WebContents to the AsyncTabCreationParams for tabbed mode

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

Index: chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
index 10bec26ea5d8efca894c1131be4c6ec4fa5c2885..8ef9508d47eeaf80119cf16d16bb3f53790e928d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
@@ -31,7 +31,6 @@ import org.chromium.chrome.browser.search_engines.TemplateUrlService;
 import org.chromium.chrome.browser.tabmodel.document.ActivityDelegate;
 import org.chromium.chrome.browser.util.IntentUtils;
 import org.chromium.content_public.browser.LoadUrlParams;
-import org.chromium.content_public.browser.WebContents;
 import org.chromium.content_public.common.Referrer;
 
 import java.util.ArrayList;
@@ -69,9 +68,9 @@ public class IntentHandler {
     public static final String EXTRA_STARTED_BY = "com.android.chrome.started_by";
 
     /**
-     * A pointer to a native web contents object to associate with the given tab.
+     * Tab ID to use when creating a new Tab.
      */
-    public static final String EXTRA_WEB_CONTENTS = "com.android.chrome.web_contents";
+    public static final String EXTRA_TAB_ID = "com.android.chrome.tab_id";
 
     /**
      * The tab id of the parent tab, if any.
@@ -872,21 +871,4 @@ public class IntentHandler {
         }
         return null;
     }
-
-    /**
-     * Retrieves a WebContents that has been parceled into the Intent.  If the WebContents was
-     * created in a different process, it is dropped on the floor.
-     * @return WebContents if one exists in the Intent AND it was created in the same process.
-     *         null otherwise.
-     */
-    public static WebContents getWebContentsFromIntent(Intent intent) {
-        WebContents deliveredContents = null;
-        if (intent != null) {
-            // The Intent may have been fired with a pre-created WebContents in it.
-            intent.setExtrasClassLoader(WebContents.class.getClassLoader());
-            deliveredContents = IntentUtils.safeGetParcelableExtra(intent, EXTRA_WEB_CONTENTS);
-            intent.setExtrasClassLoader(null);
-        }
-        return deliveredContents;
-    }
 }