Fixit: Cleanup of InfoBarController.

ios/chrome/browser/translate/never_translate_infobar_controller.mm

 // Copyright 2013 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 "ios/chrome/browser/translate/never_translate_infobar_controller.h"
 
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/translate/core/browser/translate_infobar_delegate.h"
 #include "grit/components_strings.h"
@@ skipping 10 matching lines @@
 // Action for any of the user defined buttons.
 - (void)infoBarButtonDidPress:(id)sender;
 
 @end
 
 @implementation NeverTranslateInfoBarController
 
 #pragma mark -
 #pragma mark InfoBarControllerProtocol
 
-- (void)layoutForDelegate:(infobars::InfoBarDelegate*)delegate
-                    frame:(CGRect)frame {
+- (base::scoped_nsobject<UIView<InfoBarViewProtocol>>)
+    viewForDelegate:(infobars::InfoBarDelegate*)delegate
+              frame:(CGRect)frame {
+  base::scoped_nsobject<UIView<InfoBarViewProtocol>> infoBarView;
   translate::TranslateInfoBarDelegate* translateInfoBarDelegate =
       delegate->AsTranslateInfoBarDelegate();
-  DCHECK(!infoBarView_);
   ios::ChromeBrowserProvider* provider = ios::GetChromeBrowserProvider();
-  infoBarView_.reset([provider->CreateInfoBarView()
-      initWithFrame:frame
-           delegate:delegate_]);
+  infoBarView.reset(
+      ios::GetChromeBrowserProvider()->CreateInfoBarView(frame, self.delegate));
   // Icon
   gfx::Image icon = translateInfoBarDelegate->GetIcon();
   if (!icon.IsEmpty())
-    [infoBarView_ addLeftIcon:icon.ToUIImage()];
+    [infoBarView addLeftIcon:icon.ToUIImage()];
   // Main text.
   base::string16 originalLanguage = translateInfoBarDelegate->language_name_at(
       translateInfoBarDelegate->original_language_index());
-  [infoBarView_ addLabel:l10n_util::GetNSStringF(
-                             IDS_TRANSLATE_INFOBAR_NEVER_MESSAGE_IOS,
-                             provider->GetStringProvider()->GetProductName(),
-                             originalLanguage)];
+  [infoBarView addLabel:l10n_util::GetNSStringF(
+                            IDS_TRANSLATE_INFOBAR_NEVER_MESSAGE_IOS,
+                            provider->GetStringProvider()->GetProductName(),
+                            originalLanguage)];
   // Close button.
-  [infoBarView_ addCloseButtonWithTag:TranslateInfoBarIOSTag::CLOSE
-                               target:self
-                               action:@selector(infoBarButtonDidPress:)];
+  [infoBarView addCloseButtonWithTag:TranslateInfoBarIOSTag::CLOSE
+                              target:self
+                              action:@selector(infoBarButtonDidPress:)];
   // Other buttons.
   NSString* buttonLanguage = l10n_util::GetNSStringF(
       IDS_TRANSLATE_INFOBAR_NEVER_TRANSLATE, originalLanguage);
   NSString* buttonSite = l10n_util::GetNSString(
       IDS_TRANSLATE_INFOBAR_OPTIONS_NEVER_TRANSLATE_SITE);
-  [infoBarView_ addButton1:buttonLanguage
-                      tag1:TranslateInfoBarIOSTag::DENY_LANGUAGE
-                   button2:buttonSite
-                      tag2:TranslateInfoBarIOSTag::DENY_WEBSITE
-                    target:self
-                    action:@selector(infoBarButtonDidPress:)];
+  [infoBarView addButton1:buttonLanguage
+                     tag1:TranslateInfoBarIOSTag::DENY_LANGUAGE
+                  button2:buttonSite
+                     tag2:TranslateInfoBarIOSTag::DENY_WEBSITE
+                   target:self
+                   action:@selector(infoBarButtonDidPress:)];
+  return infoBarView;
 }
 
 #pragma mark - Handling of User Events
 
 - (void)infoBarButtonDidPress:(id)sender {
   // This press might have occurred after the user has already pressed a button,
   // in which case the view has been detached from the delegate and this press
   // should be ignored.
-  if (!delegate_) {
+  if (!self.delegate) {
     return;
   }
   if ([sender isKindOfClass:[UIButton class]]) {
     NSUInteger buttonId = static_cast<UIButton*>(sender).tag;
     if (buttonId == TranslateInfoBarIOSTag::CLOSE) {
-      delegate_->InfoBarDidCancel();
+      self.delegate->InfoBarDidCancel();
     } else {
       DCHECK(buttonId == TranslateInfoBarIOSTag::DENY_LANGUAGE ||
              buttonId == TranslateInfoBarIOSTag::DENY_WEBSITE);
-      delegate_->InfoBarButtonDidPress(buttonId);
+      self.delegate->InfoBarButtonDidPress(buttonId);
     }
   }
 }
 
 @end