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

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

 // Copyright 2014 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.tabmodel.document;
 
 import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.net.Uri;
@@ skipping 115 matching lines @@
     }
 
     private Intent createNewTabIntent(
             AsyncTabCreationParams asyncParams, int parentId, boolean isChromeUI) {
         int assignedTabId = TabIdManager.getInstance().generateValidId(Tab.INVALID_TAB_ID);
         AsyncTabParamsManager.add(assignedTabId, asyncParams);
 
         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;
     }
 
     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();
             for (Map.Entry<String, String> header : extraHeaders.entrySet()) {
                 bundle.putString(header.getKey(), header.getValue());
             }
             intent.putExtra(Browser.EXTRA_HEADERS, bundle);
         }
 
         intent.putExtra(IntentHandler.EXTRA_TAB_ID, assignedTabId);
@@ skipping 24 matching lines @@
      * Passes the supplied web app launch intent to the IntentHandler.
      * @param intent Web app launch intent.
      */
     public void createNewStandaloneFrame(Intent intent) {
         assert intent != null;
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
                 | ApiCompatibilityUtils.getActivityNewDocumentFlag());
         IntentHandler.startActivityForTrustedIntent(intent);
     }
 }