Move the WebContents to the AsyncTabCreationParams for tabbed mode

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

 // Copyright 2015 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.
 
 package org.chromium.chrome.browser;
 
 import android.app.KeyguardManager;
 import android.app.PendingIntent;
 import android.app.SearchManager;
 import android.content.ComponentName;
@@ skipping 13 matching lines @@
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.chrome.browser.externalauth.ExternalAuthUtils;
 import org.chromium.chrome.browser.omnibox.AutocompleteController;
 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;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 
 /**
  * Handles all browser-related Intents.
  */
@@ skipping 17 matching lines @@
      * Note: used by first-party applications, do not rename.
      */
     public static final String EXTRA_OPEN_IN_BG = "com.android.chrome.open_with_affiliation";
 
     /**
      * Document mode: Records what caused a document to be created.
      */
     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.
      */
     public static final String EXTRA_PARENT_TAB_ID = "com.android.chrome.parent_tab_id";
 
     /**
      * Intent to bring the parent Activity back, if the parent Tab lives in a different Activity.
      */
     public static final String EXTRA_PARENT_INTENT = "com.android.chrome.parent_intent";
@@ skipping 780 matching lines @@
      * Retrieves pending referrer URL based on the given id.
      * @param id The referrer id.
      * @return The URL for the referrer or null if none found.
      */
     public static String getPendingReferrerUrl(int id) {
         if (sPendingReferrer != null && (sPendingReferrer.first == id)) {
             return sPendingReferrer.second;
         }
         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;
-    }
 }