Bug 1240549 - Put re-enter search mode functionality behind a switchboard flag. r=margaret

--HG--
extra : commitid : JiLtlSdNDN8
extra : rebase_source : 06c5cb5c1263f6aefe3fc293b69abbe3da239a6f

mobile/android/base/java/org/mozilla/gecko/BrowserApp.java

@@ -2274,7 +2274,7 @@ public class BrowserApp extends GeckoApp
         mBrowserToolbar.startEditing(url, animator);
 
         final boolean isUserSearchTerm = !TextUtils.isEmpty(selectedTab.getUserRequested());
-        if (isUserSearchTerm && AppConstants.NIGHTLY_BUILD) {
+        if (isUserSearchTerm && SwitchBoard.isInExperiment(getContext(), Experiments.SEARCH_TERM)) {
             showBrowserSearchAfterAnimation(animator);
         } else {
             showHomePagerWithAnimator(panelId, animator);

mobile/android/base/java/org/mozilla/gecko/util/Experiments.java

@@ -9,5 +9,9 @@ package org.mozilla.gecko.util;
  * https://github.com/mozilla-services/switchboard-experiments
  */
 public class Experiments {
+    // Display History and Bookmarks in 3-dot menu.
     public static final String BOOKMARKS_HISTORY_MENU = "bookmark-history-menu";
+    // Show search mode (instead of home panels) when tapping on urlbar if there is a search term in the urlbar.
+    public static final String SEARCH_TERM = "search-term";
+
 }