Remove non-elderberry herb flavors.

chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.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.document;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Notification;
 import android.app.SearchManager;
@@ skipping 315 matching lines @@
         if (!canBeHijackedByHerb(getIntent())) return false;
 
         // Different Herb flavors handle incoming intents differently.
         String flavor = FeatureUtilities.getHerbFlavor();
         if (TextUtils.isEmpty(flavor)
                 || TextUtils.equals(ChromeSwitches.HERB_FLAVOR_DISABLED, flavor)) {
             return false;
         } else if (TextUtils.equals(flavor, ChromeSwitches.HERB_FLAVOR_ELDERBERRY)) {
             return IntentUtils.safeGetBooleanExtra(getIntent(),
                     ChromeLauncherActivity.EXTRA_IS_ALLOWED_TO_RETURN_TO_PARENT, true);
-        } else if (TextUtils.equals(flavor, ChromeSwitches.HERB_FLAVOR_ANISE)
-                || TextUtils.equals(flavor, ChromeSwitches.HERB_FLAVOR_BASIL)
-                || TextUtils.equals(flavor, ChromeSwitches.HERB_FLAVOR_DILL)) {
-            // Only Intents without NEW_TASK and NEW_DOCUMENT will trigger a Custom Tab.
-            boolean isSameTask = (getIntent().getFlags() & Intent.FLAG_ACTIVITY_NEW_TASK) == 0;
-            boolean isSameDocument =
-                    (getIntent().getFlags() & Intent.FLAG_ACTIVITY_NEW_DOCUMENT) == 0;
-            Log.d(TAG, "Herb Intent proprties -- SAME TASK: "
-                    + isSameTask + ", SAME DOCUMENT: " + isSameDocument);
-            return isSameTask && isSameDocument;
-        } else if (TextUtils.equals(flavor, ChromeSwitches.HERB_FLAVOR_CHIVE)) {
-            // Send all View Intents to the main browser.
-            return false;
         } else {
-            assert false;
+            // Legacy Herb Flavors might hit this path before the caching logic corrects it, so
+            // treat this as disabled.
             return false;
         }
     }
 
     /**
      * Adds extras to the Intent that are needed by Herb.
      */
     public static void updateHerbIntent(Context context, Intent newIntent, Uri uri) {
         // For Elderberry flavored Herbs that are to be launched in a separate task, add a random
         // UUID to try and prevent Android from refocusing/clobbering items that share the same
@@ skipping 222 matching lines @@
         IntentHandler.ExternalAppId source =
                 IntentHandler.determineExternalIntentSource(getPackageName(), intent);
         if (intent.getPackage() == null && source != IntentHandler.ExternalAppId.CHROME) {
             int flagsOfInterest = Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_NEW_DOCUMENT;
             int maskedFlags = intent.getFlags() & flagsOfInterest;
             sIntentFlagsHistogram.record(maskedFlags);
         }
         MediaNotificationUma.recordClickSource(intent);
     }
 }