remove the omnibar icon changes based on UX feedback

BUG=610376

Review-Url: https://codereview.chromium.org/2130623002
Cr-Commit-Position: refs/heads/master@{#405235}

components/translate/core/browser/translate_manager.cc

@@ -167,12 +167,6 @@ void TranslateManager::InitiateTranslation(const std::string& page_lang) {
     return;
   }
 
-  // In the 2016Q2 UI, enable the translate in language state once we reach
-  // the above check and let omnibar to display the translate icon.
-  if (base::FeatureList::IsEnabled(kTranslateUI2016Q2)) {
-    language_state_.SetTranslateEnabled(true);
-  }
-
   TranslateAcceptLanguages* accept_languages =
       translate_client_->GetTranslateAcceptLanguages();
   // Don't translate any user black-listed languages.

components/translate/core/browser/translate_ui_delegate.cc

@@ -256,12 +256,7 @@ bool TranslateUIDelegate::IsLanguageBlocked() {
 void TranslateUIDelegate::SetLanguageBlocked(bool value) {
   if (value) {
     prefs_->BlockLanguage(GetOriginalLanguageCode());
-    // In the new UI, we will keep showing the translate omnibar icon
-    // even if the language is blocked so in case the user just wants to
-    // translate that page the user can invoke the translate bubble from
-    // the omnibar icon.
-    if (!base::FeatureList::IsEnabled(kTranslateUI2016Q2) &&
-        translate_manager_) {
+    if (translate_manager_) {
       translate_manager_->GetLanguageState().SetTranslateEnabled(false);
     }
   } else {
@@ -283,12 +278,7 @@ void TranslateUIDelegate::SetSiteBlacklist(bool value) {
 
   if (value) {
     prefs_->BlacklistSite(host);
-    // In the new UI, we will keep showing the translate omnibar icon
-    // even if the site is blocked so in case the user just wants to
-    // translate that page the user can invoke the translate bubble from
-    // the omnibar icon.
-    if (!base::FeatureList::IsEnabled(kTranslateUI2016Q2) &&
-        translate_manager_) {
+    if (translate_manager_) {
       translate_manager_->GetLanguageState().SetTranslateEnabled(false);
     }
   } else {

components/translate/core/browser/translate_ui_delegate_unittest.cc

@@ -173,29 +173,6 @@ TEST_F(TranslateUIDelegateTest, SetLanguageBlocked) {
   EXPECT_TRUE(manager_->GetLanguageState().translate_enabled());
 }
 
-TEST_F(TranslateUIDelegateTest, SetLanguageBlockedIn2016Q2UI) {
-  TurnOnTranslate2016Q2UIFlag();
-  std::unique_ptr<TranslatePrefs> prefs(client_->GetTranslatePrefs());
-  manager_->GetLanguageState().SetTranslateEnabled(true);
-  EXPECT_TRUE(manager_->GetLanguageState().translate_enabled());
-  prefs->UnblockLanguage("ar");
-  EXPECT_FALSE(prefs->IsBlockedLanguage("ar"));
-
-  delegate_->SetLanguageBlocked(true);
-
-  EXPECT_TRUE(prefs->IsBlockedLanguage("ar"));
-  EXPECT_TRUE(manager_->GetLanguageState().translate_enabled());
-
-  // Reset it to true again after delegate_->SetLanguageBlocked(true)
-  // turn it to false.
-  manager_->GetLanguageState().SetTranslateEnabled(true);
-
-  delegate_->SetLanguageBlocked(false);
-
-  EXPECT_FALSE(prefs->IsBlockedLanguage("ar"));
-  EXPECT_TRUE(manager_->GetLanguageState().translate_enabled());
-}
-
 TEST_F(TranslateUIDelegateTest, ShouldAlwaysTranslateBeCheckedByDefaultNever) {
   std::unique_ptr<TranslatePrefs> prefs(client_->GetTranslatePrefs());
   prefs->ResetTranslationAcceptedCount("ar");