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 799ba6adf2cec0c199dddc718c3fecc40c0002f7..27fd62a92f0e5fd68cc4d91f4f783020798e0033 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
@@ -334,19 +334,6 @@ 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;

[gone, 2016/09/28 16:45:46]

You should remove this assert in case anyone got stuck on the old flavor
somehow.  Granted, we haven't been able to assert in ages.

[Ted C, 2016/09/28 23:21:38]

True...I thought getHerbFlavor did the sanitizing, but it is actually
cacheHerbFlavor.  Will do.

             return false;