Fixit: Cleanup of InfoBarController.

ios/chrome/browser/translate/before_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/before_translate_infobar_controller.h"
 
 #import <UIKit/UIKit.h>
 
 #include "base/logging.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 106 matching lines @@
   // Navigation bar associated with the picker with "Done" and "Cancel" buttons.
   base::scoped_nsobject<UINavigationBar> _navigationBar;
   // The controller of the languagePicker. Needs to be an ivar because
   // |_languagePicker| does not retain it.
   base::scoped_nsobject<LanguagePickerController> _languagePickerController;
 }
 
 #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;
   _translateInfoBarDelegate = delegate->AsTranslateInfoBarDelegate();
-  DCHECK(!infoBarView_);
-  infoBarView_.reset([ios::GetChromeBrowserProvider()->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.
   [self updateInfobarLabel];
 
   // Close button.
-  [infoBarView_ addCloseButtonWithTag:TranslateInfoBarIOSTag::BEFORE_DENY
-                               target:self
-                               action:@selector(infoBarButtonDidPress:)];
+  [infoBarView addCloseButtonWithTag:TranslateInfoBarIOSTag::BEFORE_DENY
+                              target:self
+                              action:@selector(infoBarButtonDidPress:)];
   // Other buttons.
   NSString* buttonAccept = l10n_util::GetNSString(IDS_TRANSLATE_INFOBAR_ACCEPT);
   NSString* buttonDeny = l10n_util::GetNSString(IDS_TRANSLATE_INFOBAR_DENY);
-  [infoBarView_ addButton1:buttonAccept
-                      tag1:TranslateInfoBarIOSTag::BEFORE_ACCEPT
-                   button2:buttonDeny
-                      tag2:TranslateInfoBarIOSTag::BEFORE_DENY
-                    target:self
-                    action:@selector(infoBarButtonDidPress:)];
+  [infoBarView addButton1:buttonAccept
+                     tag1:TranslateInfoBarIOSTag::BEFORE_ACCEPT
+                  button2:buttonDeny
+                     tag2:TranslateInfoBarIOSTag::BEFORE_DENY
+                   target:self
+                   action:@selector(infoBarButtonDidPress:)];
+  return infoBarView;
 }
 
 - (void)updateInfobarLabel {
   NSString* originalLanguage =
       base::SysUTF16ToNSString(_translateInfoBarDelegate->language_name_at(
           _translateInfoBarDelegate->original_language_index()));
   NSString* targetLanguage =
       base::SysUTF16ToNSString(_translateInfoBarDelegate->language_name_at(
           _translateInfoBarDelegate->target_language_index()));
   base::string16 originalLanguageWithLink =
-      base::SysNSStringToUTF16([[infoBarView_ class]
+      base::SysNSStringToUTF16([[self.view class]
           stringAsLink:originalLanguage
                    tag:TranslateInfoBarIOSTag::BEFORE_SOURCE_LANGUAGE]);
   base::string16 targetLanguageWithLink =
-      base::SysNSStringToUTF16([[infoBarView_ class]
+      base::SysNSStringToUTF16([[self.view class]
           stringAsLink:targetLanguage
                    tag:TranslateInfoBarIOSTag::BEFORE_TARGET_LANGUAGE]);
   NSString* label =
       l10n_util::GetNSStringF(IDS_TRANSLATE_INFOBAR_BEFORE_MESSAGE_IOS,
                               originalLanguageWithLink, targetLanguageWithLink);
-  [infoBarView_ addLabel:label
-                  target:self
-                  action:@selector(infobarLinkDidPress:)];
+  [self.view addLabel:label target:self action:@selector(infobarLinkDidPress:)];
 }
 
 - (void)languageSelectionDone {
   size_t selectedRow = [_languagePicker selectedRowInComponent:0];
   if (_languageSelectionType ==
           TranslateInfoBarIOSTag::BEFORE_SOURCE_LANGUAGE &&
       selectedRow != _translateInfoBarDelegate->target_language_index()) {
     _translateInfoBarDelegate->UpdateOriginalLanguageIndex(selectedRow);
   }
   if (_languageSelectionType ==
@@ skipping 41 matching lines @@
                    animations:animations
                    completion:completion];
 }
 
 #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;
     DCHECK(buttonId == TranslateInfoBarIOSTag::BEFORE_ACCEPT ||
            buttonId == TranslateInfoBarIOSTag::BEFORE_DENY);
-    delegate_->InfoBarButtonDidPress(buttonId);
+    self.delegate->InfoBarButtonDidPress(buttonId);
   }
 }
 
 - (void)infobarLinkDidPress:(NSNumber*)tag {
   DCHECK([tag isKindOfClass:[NSNumber class]]);
   _languageSelectionType = [tag unsignedIntegerValue];
   DCHECK(_languageSelectionType ==
              TranslateInfoBarIOSTag::BEFORE_SOURCE_LANGUAGE ||
          _languageSelectionType ==
              TranslateInfoBarIOSTag::BEFORE_TARGET_LANGUAGE);
@@ skipping 65 matching lines @@
       initWithDelegate:_translateInfoBarDelegate
             initialRow:selectedRow
            disabledRow:disabledRow]);
   _languagePicker.reset(
       [[UIPickerView alloc] initWithFrame:initialPickerFrame]);
   [_languagePicker setAutoresizingMask:resizingMask];
   [_languagePicker setShowsSelectionIndicator:YES];
   [_languagePicker setDataSource:_languagePickerController];
   [_languagePicker setDelegate:_languagePickerController];
   [_languagePicker setShowsSelectionIndicator:YES];
-  [_languagePicker setBackgroundColor:[infoBarView_ backgroundColor]];
+  [_languagePicker setBackgroundColor:[self.view backgroundColor]];
   [_languagePicker selectRow:selectedRow inComponent:0 animated:NO];
 
   auto blockLanguagePicker(_languagePicker);
   auto blockNavigationBar(_navigationBar);
   [UIView animateWithDuration:kPickerAnimationDurationInSeconds
                    animations:^{
                      blockLanguagePicker.get().frame = finalPickerFrame;
                      blockNavigationBar.get().frame = finalNavigationBarFrame;
                    }];
 
   // Add the subviews.
   [_languageSelectionView addSubview:_languagePicker];
   [_languageSelectionView addSubview:_navigationBar];
 }
 
 - (void)removeView {
   [super removeView];
   [self dismissLanguageSelectionView];
 }
 
 - (void)detachView {
   [super detachView];
   [self dismissLanguageSelectionView];
 }
 
 @end