Remove all feature flag checks in Delegate.

components/translate/core/browser/translate_infobar_delegate.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/translate/core/browser/translate_infobar_delegate.h"
 
 #include <algorithm>
 #include <utility>
 
-#include "base/feature_list.h"
 #include "base/i18n/string_compare.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "build/build_config.h"
 #include "components/infobars/core/infobar.h"
 #include "components/infobars/core/infobar_manager.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/translate/core/browser/language_state.h"
 #include "components/translate/core/browser/translate_accept_languages.h"
 #include "components/translate/core/browser/translate_client.h"
@@ skipping 97 matching lines @@
   std::unique_ptr<infobars::InfoBar> infobar(translate_client->CreateInfoBar(
       base::WrapUnique(new TranslateInfoBarDelegate(
           translate_manager, is_off_the_record, step, original_language,
           target_language, error_type, triggered_from_menu))));
   if (old_delegate)
     infobar_manager->ReplaceInfoBar(old_infobar, std::move(infobar));
   else
     infobar_manager->AddInfoBar(std::move(infobar));
 }
 
-// static
-bool TranslateInfoBarDelegate::IsCompactUIEnabled() {
-  return base::FeatureList::IsEnabled(kTranslateCompactUI);
-}
-
 void TranslateInfoBarDelegate::SetResponder(Responder* responder) {
   responder_ = responder;
 }
 
 void TranslateInfoBarDelegate::UpdateOriginalLanguage(
     const std::string& language_code) {
   ui_delegate_.UpdateOriginalLanguage(language_code);
 }
 
 void TranslateInfoBarDelegate::UpdateTargetLanguage(
     const std::string& language_code) {
   ui_delegate_.UpdateTargetLanguage(language_code);
 }
 
 void TranslateInfoBarDelegate::Translate() {
   ui_delegate_.Translate();
 }
 
 void TranslateInfoBarDelegate::RevertTranslation() {
   ui_delegate_.RevertTranslation();
-  if (IsCompactUIEnabled())
-    return;
   infobar()->RemoveSelf();
 }
 
+void TranslateInfoBarDelegate::RevertWithoutClosingInfobar() {
+  ui_delegate_.RevertTranslation();
+}
+
 void TranslateInfoBarDelegate::ReportLanguageDetectionError() {
   if (translate_manager_)
     translate_manager_->ReportLanguageDetectionError();
 }
 
 void TranslateInfoBarDelegate::TranslationDeclined() {
   ui_delegate_.TranslationDeclined(true);
 }
 
 bool TranslateInfoBarDelegate::IsTranslatableLanguageByPrefs() {
@@ skipping 212 matching lines @@
 infobars::InfoBarDelegate::Type
 TranslateInfoBarDelegate::GetInfoBarType() const {
   return PAGE_ACTION_TYPE;
 }
 
 int TranslateInfoBarDelegate::GetIconId() const {
   return translate_manager_->translate_client()->GetInfobarIconID();
 }
 
 void TranslateInfoBarDelegate::InfoBarDismissed() {
-  if (step_ != translate::TRANSLATE_STEP_BEFORE_TRANSLATE)
-    return;
-  if (IsCompactUIEnabled())
-    return;
-  // The user closed the infobar without clicking the translate button.
-  TranslationDeclined();
-  UMA_HISTOGRAM_BOOLEAN("Translate.DeclineTranslateCloseInfobar", true);
+  bool declined = responder_

[napper, 2017/05/19 23:01:31]

const bool

+                      ? responder_->Declined()
+                      : (step_ == translate::TRANSLATE_STEP_BEFORE_TRANSLATE);
+
+  if (declined) {
+    // The user closed the infobar without clicking the translate button.
+    TranslationDeclined();
+    UMA_HISTOGRAM_BOOLEAN("Translate.DeclineTranslateCloseInfobar", true);
+  }
 }
 
 TranslateInfoBarDelegate*
     TranslateInfoBarDelegate::AsTranslateInfoBarDelegate() {
   return this;
 }
 
 }  // namespace translate