AGSA-initiated weblite intent URLs should be rewritten before Tab creation

BUG=584085

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

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

1 files changed, 8 insertions, 7 deletions

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/document/DocumentActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/document/DocumentActivity.java
index 91dfd06..eee242a 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/document/DocumentActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/document/DocumentActivity.java
@@ -579,13 +579,7 @@ public class DocumentActivity extends ChromeActivity {
         boolean isCreatedWithWebContents = asyncParams != null
                 && asyncParams.getWebContents() != null;
 
-        if (params != null && params.getTabToReparent() != null) {
-            mTab = params.getTabToReparent();
-            mTab.reparentToActivity(this, new DocumentTabDelegateFactory());
-        } else {
-            mTab = createActivityTab(asyncParams);
-        }
-
+        // URL modification must happen before the Tab is created.
         if (!isIncognito() && asyncParams != null) {
             LoadUrlParams loadUrlParams = asyncParams.getLoadUrlParams();
             if (loadUrlParams != null && loadUrlParams.getUrl() != null) {
@@ -594,6 +588,13 @@ public class DocumentActivity extends ChromeActivity {
             }
         }
 
+        if (params != null && params.getTabToReparent() != null) {
+            mTab = params.getTabToReparent();
+            mTab.reparentToActivity(this, new DocumentTabDelegateFactory());
+        } else {
+            mTab = createActivityTab(asyncParams);
+        }
+
         if (asyncParams != null && asyncParams.getWebContents() != null) {
             Intent parentIntent = IntentUtils.safeGetParcelableExtra(getIntent(),
                     IntentHandler.EXTRA_PARENT_INTENT);