[NTP][Realbox] Enabling rZPS in realbox should enable the realbox itself

Change-Id: Iaa3a5b3a452e67aab6af4eccb4b1a4ce4f5335e0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2242746
Commit-Queue: Justin Donnelly <jdonnelly@chromium.org>
Reviewed-by: Justin Donnelly <jdonnelly@chromium.org>
Auto-Submit: Moe Ahmadi <mahmadi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#777978}

chrome/browser/search/ntp_features.cc

@@ -70,6 +70,8 @@ bool IsRealboxEnabled() {
 
   return base::FeatureList::IsEnabled(kRealbox) ||
          base::FeatureList::IsEnabled(omnibox::kZeroSuggestionsOnNTPRealbox) ||
+         base::FeatureList::IsEnabled(
+             omnibox::kReactiveZeroSuggestionsOnNTPRealbox) ||
          (base::FeatureList::IsEnabled(omnibox::kOnFocusSuggestions) &&
           !OmniboxFieldTrial::GetZeroSuggestVariants(
                metrics::OmniboxEventProto::NTP_REALBOX)

chrome/browser/search/ntp_features_unittest.cc

@@ -14,37 +14,77 @@
 namespace ntp_features {
 
 TEST(NTPFeaturesTest, IsRealboxEnabled) {
-  base::test::ScopedFeatureList feature_list;
-  EXPECT_FALSE(IsRealboxEnabled());
+  {
+    base::test::ScopedFeatureList feature_list;
+    EXPECT_FALSE(IsRealboxEnabled());
+  }
+  {
+    base::test::ScopedFeatureList feature_list;
+    feature_list.InitAndEnableFeature(kRealbox);
+    EXPECT_TRUE(IsRealboxEnabled());
 
-  feature_list.InitAndEnableFeature(kRealbox);
-  EXPECT_TRUE(IsRealboxEnabled());
+    // Realbox is disabled when new search features are disabled.
+    feature_list.Reset();
+    feature_list.InitWithFeatures({kRealbox}, {omnibox::kNewSearchFeatures});
+    EXPECT_FALSE(IsRealboxEnabled());
+  }
+  {
+    base::test::ScopedFeatureList feature_list;
+    feature_list.InitAndEnableFeature(omnibox::kZeroSuggestionsOnNTPRealbox);
+    EXPECT_TRUE(IsRealboxEnabled());
 
-  feature_list.Reset();
-  EXPECT_FALSE(IsRealboxEnabled());
+    // Realbox is disabled when new search features are disabled.
+    feature_list.Reset();
+    feature_list.InitWithFeatures({omnibox::kZeroSuggestionsOnNTPRealbox},
+                                  {omnibox::kNewSearchFeatures});
+    EXPECT_FALSE(IsRealboxEnabled());
+  }
+  {
+    base::test::ScopedFeatureList feature_list;
+    feature_list.InitAndEnableFeature(
+        omnibox::kReactiveZeroSuggestionsOnNTPRealbox);
+    EXPECT_TRUE(IsRealboxEnabled());
 
-  feature_list.InitAndEnableFeature(omnibox::kZeroSuggestionsOnNTPRealbox);
-  EXPECT_TRUE(IsRealboxEnabled());
+    // Realbox is disabled when new search features are disabled.
+    feature_list.Reset();
+    feature_list.InitWithFeatures(
+        {omnibox::kReactiveZeroSuggestionsOnNTPRealbox},
+        {omnibox::kNewSearchFeatures});
+    EXPECT_FALSE(IsRealboxEnabled());
+  }
+  {
+    base::test::ScopedFeatureList feature_list;
+    // Reactive zero-prefix suggestions in the NTP Omnibox.
+    feature_list.InitAndEnableFeature(
+        omnibox::kReactiveZeroSuggestionsOnNTPOmnibox);
+    EXPECT_FALSE(IsRealboxEnabled());
+  }
+  {
+    base::test::ScopedFeatureList feature_list;
+    // zero-prefix suggestions are configured for the NTP Omnibox.
+    feature_list.InitWithFeaturesAndParameters(
+        {{omnibox::kOnFocusSuggestions,
+          {{"ZeroSuggestVariant:7:*", "Does not matter"}}}},
+        {});
+    EXPECT_FALSE(IsRealboxEnabled());
+  }
+  {
+    base::test::ScopedFeatureList feature_list;
+    // zero-prefix suggestions are configured for the NTP Realbox.
+    feature_list.InitWithFeaturesAndParameters(
+        {{omnibox::kOnFocusSuggestions,
+          {{"ZeroSuggestVariant:15:*", "Does not matter"}}}},
+        {});
+    EXPECT_TRUE(IsRealboxEnabled());
 
-  feature_list.Reset();
-  EXPECT_FALSE(IsRealboxEnabled());
-
-  // zero-prefix suggestions are configured for the NTP Omnibox.
-  feature_list.InitWithFeaturesAndParameters(
-      {{omnibox::kOnFocusSuggestions,
-        {{"ZeroSuggestVariant:7:*", "Does not matter"}}}},
-      {});
-  EXPECT_FALSE(IsRealboxEnabled());
-
-  feature_list.Reset();
-  EXPECT_FALSE(IsRealboxEnabled());
-
-  // zero-prefix suggestions are configured for the NTP Realbox.
-  feature_list.InitWithFeaturesAndParameters(
-      {{omnibox::kOnFocusSuggestions,
-        {{"ZeroSuggestVariant:15:*", "Does not matter"}}}},
-      {});
-  EXPECT_TRUE(IsRealboxEnabled());
+    // Realbox is disabled when new search features are disabled.
+    feature_list.Reset();
+    feature_list.InitWithFeaturesAndParameters(
+        {{omnibox::kOnFocusSuggestions,
+          {{"ZeroSuggestVariant:15:*", "Does not matter"}}}},
+        {omnibox::kNewSearchFeatures});
+    EXPECT_FALSE(IsRealboxEnabled());
+  }
 }
 
 }  // namespace ntp_features