Remove non-elderberry herb flavors.

chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java

Index: chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java
index 046bdfc67fb86be75e54d620414f9c53a6aec900..5ad0f718f5cf065377d1462c79dfd4d28cf63138 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java
@@ -333,21 +333,9 @@ public class ChromeLauncherActivity extends Activity
         } 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;
         }
     }