Remove use of translate::kTranslateMobileManualTrigger

This feature flag is now default enabled. No need to check it at runtime.

Bug: 905891
Change-Id: Id2b9d720146cd5aaae4c5a4bb40f17a48506be5d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1746734Reviewed-by: Rohit Rao <rohitrao@chromium.org>
Reviewed-by: Moe Ahmadi <mahmadi@chromium.org>
Commit-Queue: Peter Lee <pkl@chromium.org>
Cr-Commit-Position: refs/heads/master@{#686407}

ios/chrome/browser/feature_engagement/feature_engagement_egtest.mm

@@ -183,11 +183,9 @@ void EnableBadgedTranslateManualTrigger(
       "name:badged_translate_manual_trigger_trigger;comparator:==0;window:360;"
       "storage:360";
 
-  feature_list.InitWithFeaturesAndParameters(
-      {{feature_engagement::kIPHBadgedTranslateManualTriggerFeature,
-        badged_translate_manual_trigger_params},
-       {translate::kTranslateMobileManualTrigger, {}}},
-      {});
+  feature_list.InitAndEnableFeatureWithParameters(
+      feature_engagement::kIPHBadgedTranslateManualTriggerFeature,
+      badged_translate_manual_trigger_params);
 }
 
 // Enables the New Tab Tip to be triggered for |feature_list|.

ios/chrome/browser/flags/about_flags.mm

@@ -508,9 +508,6 @@ const flags_ui::FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kSendTabToSelfShowSendingUIDescription,
      flags_ui::kOsIos,
      FEATURE_VALUE_TYPE(send_tab_to_self::kSendTabToSelfShowSendingUI)},
-    {"translate-manual-trigger", flag_descriptions::kTranslateManualTriggerName,
-     flag_descriptions::kTranslateManualTriggerDescription, flags_ui::kOsIos,
-     FEATURE_VALUE_TYPE(translate::kTranslateMobileManualTrigger)},
     {"omnibox-use-default-search-engine-favicon",
      flag_descriptions::kOmniboxUseDefaultSearchEngineFaviconName,
      flag_descriptions::kOmniboxUseDefaultSearchEngineFaviconDescription,

ios/chrome/browser/flags/ios_chrome_flag_descriptions.cc

@@ -404,10 +404,6 @@ const char kToolbarNewTabButtonName[] =
 const char kToolbarNewTabButtonDescription[] =
     "When enabled, the bottom toolbar middle button opens a new tab";
 
-const char kTranslateManualTriggerName[] = "Enable manual translate trigger";
-const char kTranslateManualTriggerDescription[] =
-    "Show a menu item in the popup menu that triggers page translation.";
-
 const char kUnifiedConsentName[] = "Unified Consent";
 const char kUnifiedConsentDescription[] =
     "Enables a unified management of user consent for privacy-related "

ios/chrome/browser/translate/translate_egtest.mm

@@ -15,7 +15,6 @@
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #import "base/test/ios/wait_util.h"
-#include "base/test/scoped_feature_list.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/translate/core/browser/translate_download_manager.h"
 #include "components/translate/core/browser/translate_infobar_delegate.h"
@@ -431,7 +430,6 @@ class FakeNetworkChangeNotifier : public net::NetworkChangeNotifier {
   std::unique_ptr<net::NetworkChangeNotifier::DisableForTest>
       network_change_notifier_disabler_;
   std::unique_ptr<FakeNetworkChangeNotifier> network_change_notifier_;
-  base::test::ScopedFeatureList feature_list_;
 }
 @end
 
@@ -1523,8 +1521,6 @@ class FakeNetworkChangeNotifier : public net::NetworkChangeNotifier {
 // the page when tapped. If the page is already translated the infobar should
 // appear in "after translate" state.
 - (void)testTranslateManualTrigger {
-  feature_list_.InitAndEnableFeature(translate::kTranslateMobileManualTrigger);
-
   // Start the HTTP server.
   std::unique_ptr<web::DataResponseProvider> provider(new TestResponseProvider);
   web::test::SetUpHttpServer(std::move(provider));
@@ -1606,8 +1602,6 @@ class FakeNetworkChangeNotifier : public net::NetworkChangeNotifier {
 // Translate infobar even if user has previously selected not to translate the
 // the source language.
 - (void)testTranslateManualTriggerNeverTranslate {
-  feature_list_.InitAndEnableFeature(translate::kTranslateMobileManualTrigger);
-
   // Start the HTTP server.
   std::unique_ptr<web::DataResponseProvider> provider(new TestResponseProvider);
   web::test::SetUpHttpServer(std::move(provider));
@@ -1659,8 +1653,6 @@ class FakeNetworkChangeNotifier : public net::NetworkChangeNotifier {
 // Translate infobar even if user has previously selected not to translate the
 // the site.
 - (void)testTranslateManualTriggerNeverTranslateSite {
-  feature_list_.InitAndEnableFeature(translate::kTranslateMobileManualTrigger);
-
   // Start the HTTP server.
   std::unique_ptr<web::DataResponseProvider> provider(new TestResponseProvider);
   web::test::SetUpHttpServer(std::move(provider));
@@ -1710,8 +1702,6 @@ class FakeNetworkChangeNotifier : public net::NetworkChangeNotifier {
 // Tests that the "Translate..." button in the tools menu is disabled if
 // translate is not available.
 - (void)testTranslateManualTriggerNotEnabled {
-  feature_list_.InitAndEnableFeature(translate::kTranslateMobileManualTrigger);
-
   // Start the HTTP server.
   std::unique_ptr<web::DataResponseProvider> provider(new TestResponseProvider);
   web::test::SetUpHttpServer(std::move(provider));
@@ -1771,29 +1761,6 @@ class FakeNetworkChangeNotifier : public net::NetworkChangeNotifier {
   [ChromeTestCase removeAnyOpenMenusAndInfoBars];
 }
 
-// Tests that the "Translate..." button in the tools menu should not be visible
-// if the feature is disabled.
-- (void)testTranslateManualTriggerFeatureDisabled {
-  feature_list_.InitAndDisableFeature(translate::kTranslateMobileManualTrigger);
-
-  // Start the HTTP server.
-  std::unique_ptr<web::DataResponseProvider> provider(new TestResponseProvider);
-  web::test::SetUpHttpServer(std::move(provider));
-
-  // Load a page with French text.
-  GURL URL = web::test::HttpServer::MakeUrl(
-      base::StringPrintf("http://%s", kFrenchPagePath));
-  [ChromeEarlGrey loadURL:URL];
-
-  [self assertTranslateInfobarIsVisible];
-
-  // Make sure the Translate manual trigger button is not visible.
-  [ChromeEarlGreyUI openToolsMenu];
-  [[[EarlGrey selectElementWithMatcher:toolsMenuTranslateButton()]
-         usingSearchAction:grey_scrollInDirection(kGREYDirectionDown, 200)
-      onElementWithMatcher:ToolsMenuView()] assertWithMatcher:grey_nil()];
-}
-
 #pragma mark - Utility methods
 
 - (void)assertTranslateInfobarIsVisible {

ios/chrome/browser/ui/popup_menu/popup_menu_mediator.mm

@@ -590,9 +590,6 @@ PopupMenuToolsItem* CreateTableViewItem(int titleID,
 
 // Whether the translate menu item should be enabled.
 - (BOOL)isTranslateEnabled {
-  if (!base::FeatureList::IsEnabled(translate::kTranslateMobileManualTrigger))
-    return NO;
-
   if (!self.webState)
     return NO;
 
@@ -782,21 +779,18 @@ PopupMenuToolsItem* CreateTableViewItem(int titleID,
   [actionsArray addObject:self.bookmarkItem];
 
   // Translate.
-  if (base::FeatureList::IsEnabled(translate::kTranslateMobileManualTrigger)) {
-    UMA_HISTOGRAM_BOOLEAN("Translate.MobileMenuTranslate.Shown",
-                          [self isTranslateEnabled]);
-
-    self.translateItem = CreateTableViewItem(
-        IDS_IOS_TOOLS_MENU_TRANSLATE, PopupMenuActionTranslate,
-        @"popup_menu_translate", kToolsMenuTranslateId);
-    if (self.engagementTracker &&
-        self.engagementTracker->ShouldTriggerHelpUI(
-            feature_engagement::kIPHBadgedTranslateManualTriggerFeature)) {
-      self.translateItem.badgeText = l10n_util::GetNSStringWithFixup(
-          IDS_IOS_TOOLS_MENU_CELL_NEW_FEATURE_BADGE);
-    }
-    [actionsArray addObject:self.translateItem];
+  UMA_HISTOGRAM_BOOLEAN("Translate.MobileMenuTranslate.Shown",
+                        [self isTranslateEnabled]);
+  self.translateItem = CreateTableViewItem(
+      IDS_IOS_TOOLS_MENU_TRANSLATE, PopupMenuActionTranslate,
+      @"popup_menu_translate", kToolsMenuTranslateId);
+  if (self.engagementTracker &&
+      self.engagementTracker->ShouldTriggerHelpUI(
+          feature_engagement::kIPHBadgedTranslateManualTriggerFeature)) {
+    self.translateItem.badgeText = l10n_util::GetNSStringWithFixup(
+        IDS_IOS_TOOLS_MENU_CELL_NEW_FEATURE_BADGE);
   }
+  [actionsArray addObject:self.translateItem];
 
   // Find in Pad.
   self.findInPageItem = CreateTableViewItem(

ios/chrome/browser/ui/popup_menu/popup_menu_mediator_unittest.mm

@@ -200,10 +200,7 @@ TEST_F(PopupMenuMediatorTest, TestFeatureEngagementDisconnect) {
 // for the Tools Menu type.
 TEST_F(PopupMenuMediatorTest, TestToolsMenuItemsCount) {
   CreateMediator(PopupMenuTypeToolsMenu, NO, NO);
-  NSUInteger number_of_action_items = 6;
-  if (base::FeatureList::IsEnabled(translate::kTranslateMobileManualTrigger)) {
-    number_of_action_items++;
-  }
+  NSUInteger number_of_action_items = 7;
   if (ios::GetChromeBrowserProvider()
           ->GetUserFeedbackProvider()
           ->IsUserFeedbackEnabled()) {