Remove kTranslateRankerAutoBlacklistOverride feature code from TranslateRanker

Bug: 949716
Change-Id: If26c31874dd529ce3a37cfdd22eb4d7dfe61c14d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2385635Reviewed-by: Scott Little <sclittle@chromium.org>
Reviewed-by: Megan Jablonski <megjablon@chromium.org>
Commit-Queue: Anthony Cui <cuianthony@chromium.org>
Cr-Commit-Position: refs/heads/master@{#805110}

components/translate/core/browser/translate_ranker_impl.cc

@@ -97,9 +97,6 @@ const base::Feature kTranslateRankerQuery{"TranslateRankerQuery",
 const base::Feature kTranslateRankerEnforcement{
     "TranslateRankerEnforcement", base::FEATURE_ENABLED_BY_DEFAULT};
 
-const base::Feature kTranslateRankerAutoBlacklistOverride{
-    "TranslateRankerAutoBlacklistOverride", base::FEATURE_ENABLED_BY_DEFAULT};
-
 const base::Feature kTranslateRankerPreviousLanguageMatchesOverride{
     "TranslateRankerPreviousLanguageMatchesOverride",
     base::FEATURE_DISABLED_BY_DEFAULT};
@@ -160,8 +157,6 @@ TranslateRankerImpl::TranslateRankerImpl(const base::FilePath& model_path,
       is_query_enabled_(base::FeatureList::IsEnabled(kTranslateRankerQuery)),
       is_enforcement_enabled_(
           base::FeatureList::IsEnabled(kTranslateRankerEnforcement)),
-      is_auto_blacklist_override_enabled_(base::FeatureList::IsEnabled(
-          translate::kTranslateRankerAutoBlacklistOverride)),
       is_previous_language_matches_override_enabled_(
           base::FeatureList::IsEnabled(
               translate::kTranslateRankerPreviousLanguageMatchesOverride)) {
@@ -381,9 +376,8 @@ bool TranslateRankerImpl::ShouldOverrideDecision(
   DCHECK(metrics::TranslateEventProto::EventType_IsValid(event_type));
   if ((event_type == metrics::TranslateEventProto::MATCHES_PREVIOUS_LANGUAGE &&
        is_previous_language_matches_override_enabled_) ||
-      (event_type ==
-           metrics::TranslateEventProto::LANGUAGE_DISABLED_BY_AUTO_BLACKLIST &&
-       is_auto_blacklist_override_enabled_)) {
+      event_type ==
+          metrics::TranslateEventProto::LANGUAGE_DISABLED_BY_AUTO_BLACKLIST) {
     translate_event->add_decision_overrides(
         static_cast<metrics::TranslateEventProto::EventType>(event_type));
     DVLOG(3) << "Overriding decision of type: " << event_type;

components/translate/core/browser/translate_ranker_impl.h

@@ -42,7 +42,6 @@ extern const char kDefaultTranslateRankerModelURL[];
 // enabling enforcement implies (forces) enabling queries.
 extern const base::Feature kTranslateRankerQuery;
 extern const base::Feature kTranslateRankerEnforcement;
-extern const base::Feature kTranslateRankerAutoBlacklistOverride;
 extern const base::Feature kTranslateRankerPreviousLanguageMatchesOverride;
 
 struct TranslateRankerFeatures {
@@ -151,10 +150,6 @@ class TranslateRankerImpl : public TranslateRanker {
   // that also enables the code paths for translate ranker querying.
   bool is_enforcement_enabled_ = true;
 
-  // When set to true, overrides UI suppression caused by auto blacklist in
-  // bubble UI.
-  bool is_auto_blacklist_override_enabled_ = false;
-
   // When set to true, overrides UI suppression when previous language
   // matches current language in bubble UI.
   bool is_previous_language_matches_override_enabled_ = false;

components/translate/core/browser/translate_ranker_impl_unittest.cc

@@ -28,7 +28,6 @@
 
 namespace {
 
-using translate::kTranslateRankerAutoBlacklistOverride;
 using translate::kTranslateRankerEnforcement;
 using translate::kTranslateRankerPreviousLanguageMatchesOverride;
 using translate::kTranslateRankerQuery;
@@ -87,7 +86,7 @@ class TranslateRankerImplTest : public ::testing::Test {
   DISALLOW_COPY_AND_ASSIGN(TranslateRankerImplTest);
 };
 
-TranslateRankerImplTest::TranslateRankerImplTest() {}
+TranslateRankerImplTest::TranslateRankerImplTest() = default;
 
 void TranslateRankerImplTest::InitFeatures(
     const std::initializer_list<base::Feature>& enabled,
@@ -213,7 +212,6 @@ TEST_F(TranslateRankerImplTest, GetModelDecision) {
 
 TEST_F(TranslateRankerImplTest, ShouldOfferTranslation_AllEnabled) {
   InitFeatures({kTranslateRankerQuery, kTranslateRankerEnforcement,
-                kTranslateRankerAutoBlacklistOverride,
                 kTranslateRankerPreviousLanguageMatchesOverride},
                {});
   metrics::TranslateEventProto translate_event = CreateDefaultTranslateEvent();
@@ -235,7 +233,6 @@ TEST_F(TranslateRankerImplTest, ShouldOfferTranslation_AllEnabled) {
 }
 TEST_F(TranslateRankerImplTest, ShouldOfferTranslation_AllDisabled) {
   InitFeatures({}, {kTranslateRankerQuery, kTranslateRankerEnforcement,
-                    kTranslateRankerAutoBlacklistOverride,
                     kTranslateRankerPreviousLanguageMatchesOverride});
   metrics::TranslateEventProto translate_event = CreateDefaultTranslateEvent();
   // If query and other flags are turned off, returns true and do not query the
@@ -248,10 +245,9 @@ TEST_F(TranslateRankerImplTest, ShouldOfferTranslation_AllDisabled) {
 }
 
 TEST_F(TranslateRankerImplTest, ShouldOfferTranslation_QueryOnlyDontShow) {
-  InitFeatures(
-      {kTranslateRankerQuery},
-      {kTranslateRankerEnforcement, kTranslateRankerAutoBlacklistOverride,
-       kTranslateRankerPreviousLanguageMatchesOverride});
+  InitFeatures({kTranslateRankerQuery},
+               {kTranslateRankerEnforcement,
+                kTranslateRankerPreviousLanguageMatchesOverride});
   metrics::TranslateEventProto translate_event = CreateDefaultTranslateEvent();
   // If enforcement is turned off, returns true even if the decision
   // is not to show.
@@ -264,10 +260,9 @@ TEST_F(TranslateRankerImplTest, ShouldOfferTranslation_QueryOnlyDontShow) {
 }
 
 TEST_F(TranslateRankerImplTest, ShouldOfferTranslation_QueryOnlyShow) {
-  InitFeatures(
-      {kTranslateRankerQuery},
-      {kTranslateRankerEnforcement, kTranslateRankerAutoBlacklistOverride,
-       kTranslateRankerPreviousLanguageMatchesOverride});
+  InitFeatures({kTranslateRankerQuery},
+               {kTranslateRankerEnforcement,
+                kTranslateRankerPreviousLanguageMatchesOverride});
   metrics::TranslateEventProto translate_event = CreateDefaultTranslateEvent();
   EXPECT_TRUE(
       GetRankerForTest(0.01f)->ShouldOfferTranslation(&translate_event));
@@ -279,9 +274,9 @@ TEST_F(TranslateRankerImplTest, ShouldOfferTranslation_QueryOnlyShow) {
 
 TEST_F(TranslateRankerImplTest,
        ShouldOfferTranslation_EnforcementOnlyDontShow) {
-  InitFeatures({kTranslateRankerEnforcement},
-               {kTranslateRankerQuery, kTranslateRankerAutoBlacklistOverride,
-                kTranslateRankerPreviousLanguageMatchesOverride});
+  InitFeatures(
+      {kTranslateRankerEnforcement},
+      {kTranslateRankerQuery, kTranslateRankerPreviousLanguageMatchesOverride});
   metrics::TranslateEventProto translate_event = CreateDefaultTranslateEvent();
   // If enforcement is turned on, returns the ranker decision.
   EXPECT_FALSE(
@@ -293,9 +288,9 @@ TEST_F(TranslateRankerImplTest,
 }
 
 TEST_F(TranslateRankerImplTest, ShouldOfferTranslation_EnforcementOnlyShow) {
-  InitFeatures({kTranslateRankerEnforcement},
-               {kTranslateRankerQuery, kTranslateRankerAutoBlacklistOverride,
-                kTranslateRankerPreviousLanguageMatchesOverride});
+  InitFeatures(
+      {kTranslateRankerEnforcement},
+      {kTranslateRankerQuery, kTranslateRankerPreviousLanguageMatchesOverride});
   metrics::TranslateEventProto translate_event = CreateDefaultTranslateEvent();
   // If enforcement is turned on, returns the ranker decision.
   EXPECT_TRUE(
@@ -307,10 +302,9 @@ TEST_F(TranslateRankerImplTest, ShouldOfferTranslation_EnforcementOnlyShow) {
 }
 
 TEST_F(TranslateRankerImplTest, ShouldOfferTranslation_OverrideAndEnforcement) {
-  InitFeatures(
-      {kTranslateRankerEnforcement, kTranslateRankerAutoBlacklistOverride,
-       kTranslateRankerPreviousLanguageMatchesOverride},
-      {kTranslateRankerQuery});
+  InitFeatures({kTranslateRankerEnforcement,
+                kTranslateRankerPreviousLanguageMatchesOverride},
+               {kTranslateRankerQuery});
   metrics::TranslateEventProto translate_event = CreateDefaultTranslateEvent();
   // DecisionOverride will not interact with Query or Enforcement.
   EXPECT_FALSE(
@@ -324,8 +318,7 @@ TEST_F(TranslateRankerImplTest, ShouldOfferTranslation_OverrideAndEnforcement) {
 TEST_F(TranslateRankerImplTest, ShouldOfferTranslation_NoModel) {
   auto ranker =
       std::make_unique<TranslateRankerImpl>(base::FilePath(), GURL(), nullptr);
-  InitFeatures({kTranslateRankerAutoBlacklistOverride,
-                kTranslateRankerPreviousLanguageMatchesOverride,
+  InitFeatures({kTranslateRankerPreviousLanguageMatchesOverride,
                 kTranslateRankerQuery, kTranslateRankerEnforcement},
                {});
   metrics::TranslateEventProto translate_event = CreateDefaultTranslateEvent();
@@ -470,8 +463,7 @@ TEST_F(TranslateRankerImplTest, EnableLoggingClearsCache) {
 }
 
 TEST_F(TranslateRankerImplTest, ShouldOverrideDecision_OverrideDisabled) {
-  InitFeatures({}, {kTranslateRankerAutoBlacklistOverride,
-                    kTranslateRankerPreviousLanguageMatchesOverride});
+  InitFeatures({}, {kTranslateRankerPreviousLanguageMatchesOverride});
   std::unique_ptr<translate::TranslateRankerImpl> ranker =
       GetRankerForTest(0.0f);
   ranker->EnableLogging(true);
@@ -489,11 +481,9 @@ TEST_F(TranslateRankerImplTest, ShouldOverrideDecision_OverrideDisabled) {
   ASSERT_EQ(kEventType, flushed_events[0].event_type());
 }
 
-TEST_F(TranslateRankerImplTest,
-       ShouldOverrideDecision_AutoBlacklistOverrideEnabled) {
-  InitFeatures({kTranslateRankerAutoBlacklistOverride},
-               {kTranslateRankerQuery, kTranslateRankerEnforcement,
-                kTranslateRankerPreviousLanguageMatchesOverride});
+TEST_F(TranslateRankerImplTest, ShouldOverrideDecision) {
+  InitFeatures({}, {kTranslateRankerQuery, kTranslateRankerEnforcement,
+                    kTranslateRankerPreviousLanguageMatchesOverride});
   std::unique_ptr<translate::TranslateRankerImpl> ranker =
       GetRankerForTest(0.0f);
   ranker->EnableLogging(true);
@@ -527,39 +517,6 @@ TEST_F(TranslateRankerImplTest,
 TEST_F(TranslateRankerImplTest,
        ShouldOverrideDecision_PreviousLanguageMatchesOverrideEnabled) {
   InitFeatures({kTranslateRankerPreviousLanguageMatchesOverride},
-               {kTranslateRankerQuery, kTranslateRankerEnforcement,
-                kTranslateRankerAutoBlacklistOverride});
-  std::unique_ptr<translate::TranslateRankerImpl> ranker =
-      GetRankerForTest(0.0f);
-  ranker->EnableLogging(true);
-  metrics::TranslateEventProto translate_event = CreateDefaultTranslateEvent();
-  // DecisionOverride is decoupled from querying and enforcement. Enabling
-  // only override will not query the Ranker. Ranker returns its default
-  // response.
-  EXPECT_TRUE(
-      GetRankerForTest(0.99f)->ShouldOfferTranslation(&translate_event));
-  EXPECT_TRUE(ranker->ShouldOverrideDecision(
-      metrics::TranslateEventProto::MATCHES_PREVIOUS_LANGUAGE, kUkmSourceId0,
-      &translate_event));
-  EXPECT_FALSE(ranker->ShouldOverrideDecision(
-      metrics::TranslateEventProto::LANGUAGE_DISABLED_BY_AUTO_BLACKLIST,
-      kUkmSourceId0, &translate_event));
-
-  std::vector<metrics::TranslateEventProto> flushed_events;
-  ranker->FlushTranslateEvents(&flushed_events);
-  EXPECT_EQ(1U, flushed_events.size());
-  ASSERT_EQ(1, translate_event.decision_overrides_size());
-  ASSERT_EQ(metrics::TranslateEventProto::MATCHES_PREVIOUS_LANGUAGE,
-            translate_event.decision_overrides(0));
-  ASSERT_EQ(metrics::TranslateEventProto::LANGUAGE_DISABLED_BY_AUTO_BLACKLIST,
-            translate_event.event_type());
-  EXPECT_EQ(metrics::TranslateEventProto::NOT_QUERIED,
-            translate_event.ranker_response());
-}
-
-TEST_F(TranslateRankerImplTest, ShouldOverrideDecision_BothOverridesEnabled) {
-  InitFeatures({kTranslateRankerPreviousLanguageMatchesOverride,
-                kTranslateRankerAutoBlacklistOverride},
                {kTranslateRankerQuery, kTranslateRankerEnforcement});
   std::unique_ptr<translate::TranslateRankerImpl> ranker =
       GetRankerForTest(0.0f);
@@ -579,8 +536,6 @@ TEST_F(TranslateRankerImplTest, ShouldOverrideDecision_BothOverridesEnabled) {
 
   std::vector<metrics::TranslateEventProto> flushed_events;
   ranker->FlushTranslateEvents(&flushed_events);
-  // TranslateEventProtos are not finalized when ShouldOverrideDecision returns
-  // true, so no events are expected in the flush.
   EXPECT_EQ(0U, flushed_events.size());
   ASSERT_EQ(2, translate_event.decision_overrides_size());
   ASSERT_EQ(metrics::TranslateEventProto::MATCHES_PREVIOUS_LANGUAGE,
@@ -596,8 +551,7 @@ TEST_F(TranslateRankerImplTest, ShouldOverrideDecision_BothOverridesEnabled) {
 TEST_F(TranslateRankerImplTest,
        ShouldOverrideDecision_OverrideAndQueryEnabled) {
   InitFeatures(
-      {kTranslateRankerAutoBlacklistOverride,
-       kTranslateRankerPreviousLanguageMatchesOverride, kTranslateRankerQuery},
+      {kTranslateRankerPreviousLanguageMatchesOverride, kTranslateRankerQuery},
       {kTranslateRankerEnforcement});
   // This test checks that translate events are properly logged when ranker is
   // queried and a decision is overridden.