Add tab reparenting

chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/ActivityDelegate.java

Index: chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/ActivityDelegate.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/ActivityDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/ActivityDelegate.java
index afaa1b82c559929acddf2852298ad26e1749c215..4fc1d86c80cba560e9c79ff089435ecf17f31cfa 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/ActivityDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/ActivityDelegate.java
@@ -12,11 +12,14 @@ import android.text.TextUtils;
 
 import org.chromium.base.ApplicationStatus;
 import org.chromium.chrome.browser.ChromeActivity;
+import org.chromium.chrome.browser.IntentHandler;
 import org.chromium.chrome.browser.UrlConstants;
 import org.chromium.chrome.browser.document.DocumentActivity;
 import org.chromium.chrome.browser.externalnav.ExternalNavigationDelegateImpl;
 import org.chromium.chrome.browser.tab.Tab;
+import org.chromium.chrome.browser.tabmodel.AsyncTabParamsManager;
 import org.chromium.chrome.browser.tabmodel.document.DocumentTabModel.Entry;
+import org.chromium.chrome.browser.util.IntentUtils;
 
 import java.lang.ref.WeakReference;
 import java.util.List;
@@ -123,6 +126,11 @@ public abstract class ActivityDelegate {
     public static int getTabIdFromIntent(Intent intent) {
         if (intent == null || intent.getData() == null) return Tab.INVALID_TAB_ID;
 
+        if (AsyncTabParamsManager.hasParamsWithTabToReparent()) {

[gone, 2016/02/24 21:01:37]

Still really gross that you need to guard with this, but I guess I understand
why.  Please add a comment.

[Yusuf, 2016/02/24 21:07:37]

Done.

+            return IntentUtils.safeGetIntExtra(
+                    intent, IntentHandler.EXTRA_TAB_ID, Tab.INVALID_TAB_ID);
+        }
+
         Uri data = intent.getData();
         if (!TextUtils.equals(data.getScheme(), UrlConstants.DOCUMENT_SCHEME)) {
             return Tab.INVALID_TAB_ID;