[Herb] Set up field trial for UI prototypes

chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.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;
 
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.content.Context;
 import android.content.Intent;
@@ skipping 747 matching lines @@
          * Opens a new Tab with the possibility of showing it in a Custom Tab, instead.
          *
          * See IntentHandler#processUrlViewIntent() for an explanation most of the parameters.
          * @param forceNewTab If not handled by a Custom Tab, forces the new tab to be created.
          */
         private void openNewTab(String url, String referer, String headers,
                 String externalAppId, Intent intent, boolean forceNewTab) {
             boolean isAllowedToReturnToExternalApp = IntentUtils.safeGetBooleanExtra(intent,
                     ChromeLauncherActivity.EXTRA_IS_ALLOWED_TO_RETURN_TO_PARENT, true);
 
-            String herbFlavor = ChromePreferenceManager.getHerbFlavor();
+            String herbFlavor = FeatureUtilities.getHerbFlavor();
             if (isAllowedToReturnToExternalApp
                     && ChromeLauncherActivity.canBeHijackedByHerb(intent)
                     && TextUtils.equals(ChromeSwitches.HERB_FLAVOR_DILL, herbFlavor)) {
                 Log.d(TAG, "Sending to CustomTabActivity");
 
                 Intent newIntent = ChromeLauncherActivity.createCustomTabActivityIntent(
                         ChromeTabbedActivity.this, intent, false);
                 newIntent.putExtra(Browser.EXTRA_APPLICATION_ID, getPackageName());
                 newIntent.putExtra(
                         CustomTabIntentDataProvider.EXTRA_OPENED_BY_BROWSER, true);
@@ skipping 324 matching lines @@
             Log.i(TAG, "handleBackPressedWithoutBackStack() - help url");
             return true;
         }
 
         // Herb: Current spec says that tabs are closed only when there is NO "X" visible, i.e. when
         //       the tab is NOT allowed to return to the external app.
         boolean isAllowedToCloseTab = true;
         if (alwaysAllowTabClosure) {
             isAllowedToCloseTab = true;
         } else {
-            String herbFlavor = ChromePreferenceManager.getHerbFlavor();
+            String herbFlavor = FeatureUtilities.getHerbFlavor();
             if (TextUtils.equals(ChromeSwitches.HERB_FLAVOR_BASIL, herbFlavor)
                     || TextUtils.equals(ChromeSwitches.HERB_FLAVOR_CHIVE, herbFlavor)) {
                 isAllowedToCloseTab = !currentTab.isAllowedToReturnToExternalApp();
             }
         }
 
         // [true]: Reached the bottom of the back stack on a tab the user did not explicitly
         // create (i.e. it was created by an external app or opening a link in background, etc).
         // [false]: Reached the bottom of the back stack on a tab that the user explicitly
         // created (e.g. selecting "new tab" from menu).
@@ skipping 259 matching lines @@
         if (getActivityTab() != null) {
             setStatusBarColor(getActivityTab(), getActivityTab().getThemeColor());
         }
     }
 
     @Override
     protected void setStatusBarColor(Tab tab, int color) {
         super.setStatusBarColor(tab, isInOverviewMode() ? Color.BLACK : color);
     }
 }