[Translate] Remove old Desktop Translate UI experiments

Change-Id: Ied29ff46bbe283b264d844b67fa317c1527b5535
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1921655
Commit-Queue: Megan Jablonski <megjablon@chromium.org>
Reviewed-by: anthonyvd <anthonyvd@chromium.org>
Cr-Commit-Position: refs/heads/master@{#718830}

chrome/browser/about_flags.cc

@@ -945,20 +945,11 @@ const FeatureEntry::FeatureVariation kOmniboxMaxURLMatchesVariations[] = {
 
 #if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || \
     defined(OS_CHROMEOS)
-const FeatureEntry::FeatureParam kTranslateBubbleUIButton[] = {
-    {language::kTranslateUIBubbleKey, language::kTranslateUIBubbleButtonValue}};
 const FeatureEntry::FeatureParam kTranslateBubbleUITab[] = {
     {language::kTranslateUIBubbleKey, language::kTranslateUIBubbleTabValue}};
-const FeatureEntry::FeatureParam kTranslateBubbleUIButtonGM2[] = {
-    {language::kTranslateUIBubbleKey,
-     language::kTranslateUIBubbleButtonGM2Value}};
 
 const FeatureEntry::FeatureVariation kTranslateBubbleUIVariations[] = {
-    {"Button", kTranslateBubbleUIButton, base::size(kTranslateBubbleUIButton),
-     nullptr},
-    {"Tab", kTranslateBubbleUITab, base::size(kTranslateBubbleUITab), nullptr},
-    {"Button_GM2", kTranslateBubbleUIButtonGM2,
-     base::size(kTranslateBubbleUIButton), nullptr}};
+    {"Tab", kTranslateBubbleUITab, base::size(kTranslateBubbleUITab), nullptr}};
 #endif  // OS_LINUX || OS_MACOSX || OS_WIN || OS_CHROMEOS
 
 const FeatureEntry::FeatureParam kMarkHttpAsDangerous[] = {

chrome/browser/ui/views/translate/translate_bubble_view.h

@@ -254,9 +254,8 @@ class TranslateBubbleView : public LocationBarBubbleDelegateView,
   std::unique_ptr<views::View> CreateViewErrorNoTitle(
       std::unique_ptr<views::Button> advanced_button);
 
-  // Creates the 'error' view for Tab and Button_GM2 UI.
+  // Creates the 'error' view for Tab UI.
   std::unique_ptr<views::View> CreateViewErrorTab();
-  std::unique_ptr<views::View> CreateViewErrorGM2();
 
   // Creates the 'advanced' view. Caller takes ownership of the returned view.
   // Three options depending on UI selection in kUseButtonTranslateBubbleUI.
@@ -271,23 +270,6 @@ class TranslateBubbleView : public LocationBarBubbleDelegateView,
   // Tab UI present the same view for before/during/after translate state.
   bool TabUiIsEquivalentState(TranslateBubbleModel::ViewState view_state);
 
-  // Creates the skeleton view for GM2 UI.
-  std::unique_ptr<views::View> GM2CreateView(
-      std::unique_ptr<views::Button> action_button,
-      std::unique_ptr<views::View> status_indicator,
-      bool active_option_button,
-      std::unique_ptr<views::Label> source_language_label,
-      std::unique_ptr<views::Label> target_language_label);
-
-  // Creates the 'before translate' view for Button_GM2 UI.
-  std::unique_ptr<views::View> GM2CreateViewBeforeTranslate();
-
-  // Creates the 'translating' view for Button_GM2 UI.
-  std::unique_ptr<views::View> GM2CreateViewTranslating();
-
-  // Creates the 'after translate' view for Button_GM2 UI.
-  std::unique_ptr<views::View> GM2CreateViewAfterTranslate();
-
   // Creates the 'advanced' view to show source/target language combobox under
   // TAB UI. Caller takes ownership of the returned view.
   std::unique_ptr<views::View> CreateViewAdvancedTabUi(
@@ -347,11 +329,6 @@ class TranslateBubbleView : public LocationBarBubbleDelegateView,
   views::Checkbox* advanced_always_translate_checkbox_ = nullptr;
   views::TabbedPane* tabbed_pane_ = nullptr;
 
-  // Button_GM2 UI source/target language label class variable to be updated
-  // based on user selction in
-  views::Label* gm2_source_language_label_ = nullptr;
-  views::Label* gm2_target_language_label_ = nullptr;
-
   views::LabelButton* advanced_cancel_button_ = nullptr;
   views::LabelButton* advanced_done_button_ = nullptr;
 

components/language/core/common/language_experiments.cc

@@ -45,9 +45,7 @@ const char kOverrideModelDefaultValue[] = "default";
 
 // Params for Translate Desktop UI experiment
 const char kTranslateUIBubbleKey[] = "translate_ui_bubble_style";
-const char kTranslateUIBubbleButtonValue[] = "button";
 const char kTranslateUIBubbleTabValue[] = "tab";
-const char kTranslateUIBubbleButtonGM2Value[] = "button_gm2";
 
 OverrideLanguageModel GetOverrideLanguageModel() {
   std::map<std::string, std::string> params;
@@ -115,14 +113,8 @@ TranslateUIBubbleModel GetTranslateUiBubbleModel() {
   if (base::GetFieldTrialParamsByFeature(language::kUseButtonTranslateBubbleUi,
                                          &params)) {
     if (params[language::kTranslateUIBubbleKey] ==
-        language::kTranslateUIBubbleButtonValue) {
-      return language::TranslateUIBubbleModel::BUTTON;
-    } else if (params[language::kTranslateUIBubbleKey] ==
-               language::kTranslateUIBubbleTabValue) {
+        language::kTranslateUIBubbleTabValue) {
       return language::TranslateUIBubbleModel::TAB;
-    } else if (params[language::kTranslateUIBubbleKey] ==
-               language::kTranslateUIBubbleButtonGM2Value) {
-      return language::TranslateUIBubbleModel::BUTTON_GM2;
     } else {
       return language::TranslateUIBubbleModel::DEFAULT;
     }

components/language/core/common/language_experiments.h

@@ -38,9 +38,7 @@ extern const base::Feature kUseButtonTranslateBubbleUi;
 
 // These feature params controls what translate bubble UI to display.
 extern const char kTranslateUIBubbleKey[];
-extern const char kTranslateUIBubbleButtonValue[];
 extern const char kTranslateUIBubbleTabValue[];
-extern const char kTranslateUIBubbleButtonGM2Value[];
 
 enum class OverrideLanguageModel {
   DEFAULT,
@@ -52,9 +50,7 @@ enum class OverrideLanguageModel {
 // Options for the translate desktop UI experiment.
 enum class TranslateUIBubbleModel {
   DEFAULT,
-  BUTTON,
   TAB,
-  BUTTON_GM2,
 };
 
 // Returns which language model to use depending on the state of all Language