Revert of Fixes redirects to external apps when navigating from PWA.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/TabDelegate.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/TabDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/TabDelegate.java
index bea73b89ba79df354678c041ec58abcb0b88ce46..6d995d7ca25420557d31a36522d3e2603a301c3b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/TabDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/TabDelegate.java
@@ -133,6 +133,13 @@
         Intent intent = new Intent(
                 Intent.ACTION_VIEW, Uri.parse(asyncParams.getLoadUrlParams().getUrl()));
 
+        ComponentName componentName = asyncParams.getComponentName();
+        if (componentName == null) {
+            intent.setClass(ContextUtils.getApplicationContext(), ChromeLauncherActivity.class);
+        } else {
+            intent.setComponent(componentName);
+        }
+
         addAsyncTabExtras(asyncParams, parentId, isChromeUI, assignedTabId, intent);
 
         return intent;
@@ -140,13 +147,6 @@
 
     protected final void addAsyncTabExtras(AsyncTabCreationParams asyncParams, int parentId,
             boolean isChromeUI, int assignedTabId, Intent intent) {
-        ComponentName componentName = asyncParams.getComponentName();
-        if (componentName == null) {
-            intent.setClass(ContextUtils.getApplicationContext(), ChromeLauncherActivity.class);
-        } else {
-            intent.setComponent(componentName);
-        }
-
         Map<String, String> extraHeaders = asyncParams.getLoadUrlParams().getExtraHeaders();
         if (extraHeaders != null && !extraHeaders.isEmpty()) {
             Bundle bundle = new Bundle();