Enabling all touch-friendly launcher features by default.

- This reverts commit 2f873e14,
  "cros:Enable PlaystoreSearch and AnswerCards by Default on Eve Only".
- Full-screen is already ON, blur is ON on selected devices.
  Enabling for Answer Cards and Play Store app searching.

This will be landed when prod server is 100%.

Bug: 766784
Change-Id: Ie4c685a82c6e6f2e89ec082480f33e4ecc57039f
Reviewed-on: https://chromium-review.googlesource.com/678735Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Vadim Tryshev <vadimt@chromium.org>
Commit-Queue: Jiaquan He <hejq@google.com>
Cr-Commit-Position: refs/heads/master@{#504404}

chrome/browser/ui/app_list/search/answer_card/answer_card_search_provider_unittest.cc

@@ -4,6 +4,7 @@
 
 #include <stddef.h>
 
+#include <map>
 #include <memory>
 #include <string>
 #include <utility>
@@ -146,7 +147,7 @@ class AnswerCardSearchProviderTest : public AppListTestBase {
     std::unique_ptr<base::FeatureList> feature_list =
         base::MakeUnique<base::FeatureList>();
     feature_list->RegisterFieldTrialOverride(
-        features::kEnableAnswerCardDefaultOff.name,
+        features::kEnableAnswerCard.name,
         base::FeatureList::OVERRIDE_ENABLE_FEATURE, trial.get());
     scoped_feature_list_.InitWithFeatureList(std::move(feature_list));
 

ui/app_list/app_list_features.cc

@@ -6,52 +6,27 @@
 
 #include "base/feature_list.h"
 #include "base/metrics/field_trial_params.h"
-#include "base/sys_info.h"
 
 namespace app_list {
 namespace features {
 
-const base::Feature kEnableAnswerCardDefaultOff{
-    "EnableAnswerCard", base::FEATURE_DISABLED_BY_DEFAULT};
-const base::Feature kEnableAnswerCardDefaultOn{
-    "EnableAnswerCard", base::FEATURE_ENABLED_BY_DEFAULT};
+const base::Feature kEnableAnswerCard{"EnableAnswerCard",
+                                      base::FEATURE_ENABLED_BY_DEFAULT};
 const base::Feature kEnableAnswerCardDarkRun{"EnableAnswerCardDarkRun",
                                              base::FEATURE_DISABLED_BY_DEFAULT};
 const base::Feature kEnableBackgroundBlur{"EnableBackgroundBlur",
                                           base::FEATURE_DISABLED_BY_DEFAULT};
 const base::Feature kEnableFullscreenAppList{"EnableFullscreenAppList",
                                              base::FEATURE_ENABLED_BY_DEFAULT};
-const base::Feature kEnablePlayStoreAppSearchDefaultOff{
-    "EnablePlayStoreAppSearch", base::FEATURE_DISABLED_BY_DEFAULT};
-const base::Feature kEnablePlayStoreAppSearchDefaultOn{
-    "EnablePlayStoreAppSearch", base::FEATURE_ENABLED_BY_DEFAULT};
+const base::Feature kEnablePlayStoreAppSearch{"EnablePlayStoreAppSearch",
+                                              base::FEATURE_ENABLED_BY_DEFAULT};
 const base::Feature kEnableAppListFocus{"EnableAppListFocus",
                                         base::FEATURE_DISABLED_BY_DEFAULT};
 
-namespace {
-
-bool IsDeviceEve() {
-  static size_t position = base::SysInfo::GetLsbReleaseBoard().find("eve");
-  static bool is_device_eve = position != std::string::npos;
-
-  return is_device_eve;
-}
-
-const base::Feature& GetAnswerCardFeature() {
-  return IsDeviceEve() ? kEnableAnswerCardDefaultOn
-                       : kEnableAnswerCardDefaultOff;
-}
-
-const base::Feature& GetPlaystoreAppSearchFeature() {
-  return IsDeviceEve() ? kEnablePlayStoreAppSearchDefaultOn
-                       : kEnablePlayStoreAppSearchDefaultOff;
-}
-
-}  // namespace
 
 bool IsAnswerCardEnabled() {
   // Not using local static variable to allow tests to change this value.
-  return base::FeatureList::IsEnabled(GetAnswerCardFeature());
+  return base::FeatureList::IsEnabled(kEnableAnswerCard);
 }
 
 bool IsAnswerCardDarkRunEnabled() {
@@ -78,7 +53,7 @@ bool IsTouchFriendlySearchResultsPageEnabled() {
 
 bool IsPlayStoreAppSearchEnabled() {
   // Not using local static variable to allow tests to change this value.
-  return base::FeatureList::IsEnabled(GetPlaystoreAppSearchFeature());
+  return base::FeatureList::IsEnabled(kEnablePlayStoreAppSearch);
 }
 
 bool IsAppListFocusEnabled() {
@@ -86,16 +61,15 @@ bool IsAppListFocusEnabled() {
 }
 
 std::string AnswerServerUrl() {
-  const std::string experiment_url = base::GetFieldTrialParamValueByFeature(
-      GetAnswerCardFeature(), "ServerUrl");
+  const std::string experiment_url =
+      base::GetFieldTrialParamValueByFeature(kEnableAnswerCard, "ServerUrl");
   if (!experiment_url.empty())
     return experiment_url;
-
   return "https://www.google.com/coac";
 }
 
 std::string AnswerServerQuerySuffix() {
-  return base::GetFieldTrialParamValueByFeature(GetAnswerCardFeature(),
+  return base::GetFieldTrialParamValueByFeature(kEnableAnswerCard,
                                                 "QuerySuffix");
 }
 

ui/app_list/app_list_features.h

@@ -19,8 +19,7 @@ namespace features {
 // Please keep these features sorted.
 
 // Enables the answer card in the app list.
-APP_LIST_EXPORT extern const base::Feature kEnableAnswerCardDefaultOff;
-APP_LIST_EXPORT extern const base::Feature kEnableAnswerCardDefaultOn;
+APP_LIST_EXPORT extern const base::Feature kEnableAnswerCard;
 
 // Enables the dark run answer card in the app list. In this mode, answer cards
 // may be loaded via mock URLs and are not shown to the user.
@@ -35,8 +34,7 @@ APP_LIST_EXPORT extern const base::Feature kEnableBackgroundBlur;
 APP_LIST_EXPORT extern const base::Feature kEnableFullscreenAppList;
 
 // Enables the Play Store app search.
-APP_LIST_EXPORT extern const base::Feature kEnablePlayStoreAppSearchDefaultOff;
-APP_LIST_EXPORT extern const base::Feature kEnablePlayStoreAppSearchDefaultOn;
+APP_LIST_EXPORT extern const base::Feature kEnablePlayStoreAppSearch;
 
 // Enables the app list focus. In this mode, many views become focusable. Focus
 // transition are handled by FocusManager and accessibility focus transition can

ui/app_list/views/search_result_page_view_unittest.cc

@@ -64,23 +64,22 @@ class SearchResultPageViewTest : public views::ViewsTestBase,
     if (test_with_fullscreen_) {
       if (test_with_answer_card) {
         scoped_feature_list_.InitWithFeatures(
-            {features::kEnableFullscreenAppList,
-             features::kEnableAnswerCardDefaultOff},
+            {features::kEnableFullscreenAppList, features::kEnableAnswerCard},
             {});
       } else {
         scoped_feature_list_.InitWithFeatures(
             {features::kEnableFullscreenAppList},
-            {features::kEnableAnswerCardDefaultOff});
+            {features::kEnableAnswerCard});
       }
     } else {
       if (test_with_answer_card) {
         scoped_feature_list_.InitWithFeatures(
-            {features::kEnableAnswerCardDefaultOff},
+            {features::kEnableAnswerCard},
             {features::kEnableFullscreenAppList});
       } else {
         scoped_feature_list_.InitWithFeatures(
-            {}, {features::kEnableFullscreenAppList,
-                 features::kEnableAnswerCardDefaultOff});
+            {},
+            {features::kEnableFullscreenAppList, features::kEnableAnswerCard});
       }
     }
     ASSERT_EQ(test_with_fullscreen_, features::IsFullscreenAppListEnabled());

ui/app_list/views/search_result_tile_item_list_view_unittest.cc

@@ -44,12 +44,12 @@ class SearchResultTileItemListViewTest
     if (IsPlayStoreAppSearchEnabled()) {
       scoped_feature_list_.InitWithFeatures(
           {features::kEnableFullscreenAppList,
-           features::kEnablePlayStoreAppSearchDefaultOff},
+           features::kEnablePlayStoreAppSearch},
           {});
     } else {
       scoped_feature_list_.InitWithFeatures(
           {features::kEnableFullscreenAppList},
-          {features::kEnablePlayStoreAppSearchDefaultOff});
+          {features::kEnablePlayStoreAppSearch});
     }
     ASSERT_EQ(IsPlayStoreAppSearchEnabled(),
               features::IsPlayStoreAppSearchEnabled());