[ObjC ARC] Converts ios/chrome/browser/ui/toolbar:toolbar to ARC.

ios/chrome/browser/ui/toolbar/web_toolbar_controller.mm

 // Copyright 2012 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.
 
 #import "ios/chrome/browser/ui/toolbar/web_toolbar_controller.h"
 
 #import <CoreLocation/CoreLocation.h>
 #include <QuartzCore/QuartzCore.h>
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <memory>
 
 #include "base/command_line.h"
-#include "base/ios/weak_nsobject.h"
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/foundation_util.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/user_metrics.h"
 #include "base/metrics/user_metrics_action.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/omnibox/browser/omnibox_edit_model.h"
@@ skipping 10 matching lines @@
 #import "ios/chrome/browser/ui/animation_util.h"
 #import "ios/chrome/browser/ui/colors/MDCPalette+CrAdditions.h"
 #import "ios/chrome/browser/ui/commands/UIKit+ChromeExecuteCommand.h"
 #import "ios/chrome/browser/ui/commands/generic_chrome_command.h"
 #include "ios/chrome/browser/ui/commands/ios_command_ids.h"
 #import "ios/chrome/browser/ui/history/tab_history_popup_controller.h"
 #import "ios/chrome/browser/ui/image_util.h"
 #import "ios/chrome/browser/ui/keyboard/hardware_keyboard_watcher.h"
 #include "ios/chrome/browser/ui/omnibox/location_bar_controller_impl.h"
 #include "ios/chrome/browser/ui/omnibox/omnibox_view_ios.h"
+#import "ios/chrome/browser/ui/popup_menu/popup_menu_view.h"
 #import "ios/chrome/browser/ui/reversed_animation.h"
 #include "ios/chrome/browser/ui/rtl_geometry.h"
 #import "ios/chrome/browser/ui/toolbar/toolbar_controller+protected.h"
 #import "ios/chrome/browser/ui/toolbar/toolbar_controller.h"
 #import "ios/chrome/browser/ui/toolbar/toolbar_model_ios.h"
 #include "ios/chrome/browser/ui/toolbar/toolbar_resource_macros.h"
 #include "ios/chrome/browser/ui/ui_util.h"
 #import "ios/chrome/browser/ui/uikit_ui_util.h"
 #import "ios/chrome/browser/ui/url_loader.h"
 #import "ios/chrome/browser/ui/voice/text_to_speech_player.h"
 #import "ios/chrome/browser/ui/voice/voice_search_notification_names.h"
 #import "ios/chrome/common/material_timing.h"
 #include "ios/chrome/grit/ios_strings.h"
 #import "ios/public/provider/chrome/browser/chrome_browser_provider.h"
 #import "ios/public/provider/chrome/browser/images/branded_image_provider.h"
 #import "ios/public/provider/chrome/browser/voice/voice_search_provider.h"
 #include "ios/shared/chrome/browser/ui/omnibox/location_bar_controller.h"
 #include "ios/shared/chrome/browser/ui/omnibox/location_bar_delegate.h"
 #import "ios/third_party/material_components_ios/src/components/Palettes/src/MaterialPalettes.h"
 #import "ios/third_party/material_components_ios/src/components/ProgressView/src/MaterialProgressView.h"
 #import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
 #include "ios/web/public/referrer.h"
 #import "ios/web/public/web_state/web_state.h"
 #import "net/base/mac/url_conversions.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/page_transition_types.h"
 #import "ui/gfx/ios/NSString+CrStringDrawing.h"
 
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
 using base::UserMetricsAction;
 using ios::material::TimingFunction;
 
 NSString* const kTabHistoryPopupWillShowNotification =
     @"kTabHistoryPopupWillShowNotification";
 NSString* const kTabHistoryPopupWillHideNotification =
     @"kTabHistoryPopupWillHideNotification";
 const CGFloat kiPhoneOmniboxPlaceholderColorBrightness = 150 / 255.0;
 
 // The histogram recording CLAuthorizationStatus for omnibox queries.
@@ skipping 150 matching lines @@
 // switch the main bots to Xcode 8.
 #if defined(__IPHONE_10_0) && (__IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0)
 @interface WebToolbarController ()<CAAnimationDelegate>
 @end
 #endif
 
 @interface WebToolbarController ()<LocationBarDelegate,
                                    OmniboxPopupPositioner,
                                    ToolbarFrameDelegate> {
   // Top-level view for web content.
-  base::scoped_nsobject<UIView> _webToolbar;
-  base::scoped_nsobject<UIButton> _backButton;
-  base::scoped_nsobject<UIButton> _forwardButton;
-  base::scoped_nsobject<UIButton> _reloadButton;
-  base::scoped_nsobject<UIButton> _stopButton;
-  base::scoped_nsobject<UIButton> _starButton;
-  base::scoped_nsobject<UIButton> _voiceSearchButton;
-  base::scoped_nsobject<OmniboxTextFieldIOS> _omniBox;
-  base::scoped_nsobject<UIButton> _cancelButton;
-  base::scoped_nsobject<UIView> _keyBoardAccessoryView;
-  base::scoped_nsobject<UIButton> _keyboardVoiceSearchButton;
+  UIView* _webToolbar;
+  UIButton* _backButton;
+  UIButton* _forwardButton;
+  UIButton* _reloadButton;
+  UIButton* _stopButton;
+  UIButton* _starButton;
+  UIButton* _voiceSearchButton;
+  OmniboxTextFieldIOS* _omniBox;
+  UIButton* _cancelButton;
+  UIView* _keyBoardAccessoryView;
+  UIButton* _keyboardVoiceSearchButton;
   // Progress bar used to show what fraction of the page has loaded.
-  base::scoped_nsobject<MDCProgressView> _determinateProgressView;
-  base::scoped_nsobject<UIImageView> _omniboxBackground;
+  MDCProgressView* _determinateProgressView;
+  UIImageView* _omniboxBackground;
   BOOL _prerenderAnimating;
-  base::scoped_nsobject<UIImageView> _incognitoIcon;
-  base::scoped_nsobject<UIView> _clippingView;
+  UIImageView* _incognitoIcon;
+  UIView* _clippingView;
 
   std::unique_ptr<LocationBarController> _locationBar;
   BOOL _initialLayoutComplete;
   // If |YES|, toolbar is incognito.
   BOOL _incognito;
 
   // If set to |YES|, disables animations that tests would otherwise trigger.
   BOOL _unitTesting;
 
   // If set to |YES|, text to speech is currently playing and the toolbar voice
   // icon should indicate so.
   BOOL _isTTSPlaying;
 
   // Keeps track of whether or not the back button's images have been reversed.
   ToolbarButtonMode _backButtonMode;
 
   // Keeps track of whether or not the forward button's images have been
   // reversed.
   ToolbarButtonMode _forwardButtonMode;
 
   // Keeps track of last known trait collection used by the subviews.
-  base::scoped_nsobject<UITraitCollection> _lastKnownTraitCollection;
+  UITraitCollection* _lastKnownTraitCollection;
 
   // A snapshot of the current toolbar view. Only valid for phone, will be nil
   // if on tablet.
-  base::scoped_nsobject<UIImage> _snapshot;
+  UIImage* _snapshot;
   // A hash of the state of the toolbar when the snapshot was taken.
   uint32_t _snapshotHash;
 
   // View controller for displaying tab history when the user long presses the
   // back or forward button. nil if not visible.
-  base::scoped_nsobject<TabHistoryPopupController> _tabHistoryPopupController;
+  TabHistoryPopupController* _tabHistoryPopupController;
 
   // Hardware keyboard watcher, to detect the type of keyboard currently
   // attached.
-  base::scoped_nsobject<HardwareKeyboardWatcher> _hardwareKeyboardWatcher;
+  HardwareKeyboardWatcher* _hardwareKeyboardWatcher;
 
   // The current browser state.
   ios::ChromeBrowserState* _browserState;  // weak
 }
 
 // Accessor for cancel button. Handles lazy initialization.
 - (UIButton*)cancelButton;
 // Handler called after user pressed the cancel button.
 - (void)cancelButtonPressed:(id)sender;
 - (void)layoutCancelButton;
@@ skipping 80 matching lines @@
                                           : ToolbarControllerStyleLightMode)];
   if (!self)
     return nil;
 
   self.readingListModel =
       ReadingListModelFactory::GetForBrowserState(browserState);
 
   InterfaceIdiom idiom = IsIPadIdiom() ? IPAD_IDIOM : IPHONE_IDIOM;
   // Note that |_webToolbar| gets its frame set to -specificControlArea later in
   // this method.
-  _webToolbar.reset([[UIView alloc]
-      initWithFrame:LayoutRectGetRect(kWebToolbarFrame[idiom])]);
+  _webToolbar =
+      [[UIView alloc] initWithFrame:LayoutRectGetRect(kWebToolbarFrame[idiom])];
   UIColor* textColor =
       _incognito
           ? [UIColor whiteColor]
           : [UIColor colorWithWhite:0 alpha:[MDCTypography body1FontOpacity]];
   UIColor* tintColor = _incognito ? textColor : nil;
   CGRect omniboxRect = LayoutRectGetRect(kOmniboxFrame[idiom]);
-  _omniBox.reset([[OmniboxTextFieldIOS alloc]
-      initWithFrame:omniboxRect
-               font:[MDCTypography subheadFont]
-          textColor:textColor
-          tintColor:tintColor]);
+  _omniBox =
+      [[OmniboxTextFieldIOS alloc] initWithFrame:omniboxRect
+                                            font:[MDCTypography subheadFont]
+                                       textColor:textColor
+                                       tintColor:tintColor];
   if (_incognito) {
     [_omniBox setIncognito:YES];
     [_omniBox
         setSelectedTextBackgroundColor:[UIColor colorWithWhite:1 alpha:0.1]];
     [_omniBox setPlaceholderTextColor:[UIColor colorWithWhite:1 alpha:0.5]];
   } else if (!IsIPadIdiom()) {
     // Set placeholder text color to match fakebox placeholder text color when
     // on iPhone and in regular mode.
     UIColor* placeholderTextColor =
         [UIColor colorWithWhite:kiPhoneOmniboxPlaceholderColorBrightness
                           alpha:1.0];
     [_omniBox setPlaceholderTextColor:placeholderTextColor];
   }
-  _backButton.reset([[UIButton alloc]
-      initWithFrame:LayoutRectGetRect(kBackButtonFrame[idiom])]);
+  _backButton = [[UIButton alloc]
+      initWithFrame:LayoutRectGetRect(kBackButtonFrame[idiom])];
   [_backButton setAutoresizingMask:UIViewAutoresizingFlexibleTrailingMargin() |
                                    UIViewAutoresizingFlexibleTopMargin |
                                    UIViewAutoresizingFlexibleBottomMargin];
   // Note that the forward button gets repositioned when -layoutOmnibox is
   // called.
-  _forwardButton.reset([[UIButton alloc]
-      initWithFrame:LayoutRectGetRect(kForwardButtonFrame[idiom])]);
+  _forwardButton = [[UIButton alloc]
+      initWithFrame:LayoutRectGetRect(kForwardButtonFrame[idiom])];
   [_forwardButton
       setAutoresizingMask:UIViewAutoresizingFlexibleTrailingMargin() |
                           UIViewAutoresizingFlexibleBottomMargin];
 
   [_webToolbar addSubview:_backButton];
   [_webToolbar addSubview:_forwardButton];
 
   // _omniboxBackground needs to be added under _omniBox so as not to cover up
   // _omniBox.
-  _omniboxBackground.reset([[UIImageView alloc] initWithFrame:omniboxRect]);
+  _omniboxBackground = [[UIImageView alloc] initWithFrame:omniboxRect];
   [_omniboxBackground
       setAutoresizingMask:UIViewAutoresizingFlexibleWidth |
                           UIViewAutoresizingFlexibleBottomMargin];
 
   if (idiom == IPAD_IDIOM) {
     [_webToolbar addSubview:_omniboxBackground];
   } else {
     [_backButton setImageEdgeInsets:UIEdgeInsetsMakeDirected(0, 0, 0, -9)];
     [_forwardButton setImageEdgeInsets:UIEdgeInsetsMakeDirected(0, -7, 0, 0)];
     CGRect clippingFrame =
         RectShiftedUpAndResizedForStatusBar(kToolbarFrame[idiom]);
-    _clippingView.reset([[UIView alloc] initWithFrame:clippingFrame]);
+    _clippingView = [[UIView alloc] initWithFrame:clippingFrame];
     [_clippingView setAutoresizingMask:UIViewAutoresizingFlexibleWidth |
                                        UIViewAutoresizingFlexibleBottomMargin];
     [_clippingView setClipsToBounds:YES];
     [_clippingView setUserInteractionEnabled:NO];
     [_webToolbar addSubview:_clippingView];
 
     CGRect omniboxBackgroundFrame =
         RectShiftedDownForStatusBar([_omniboxBackground frame]);
     [_omniboxBackground setFrame:omniboxBackgroundFrame];
     [_clippingView addSubview:_omniboxBackground];
     [self.view
         setBackgroundColor:[UIColor colorWithWhite:kNTPBackgroundColorBrightness
                                              alpha:1.0]];
 
     if (_incognito) {
       [self.view
           setBackgroundColor:
               [UIColor colorWithWhite:kNTPBackgroundColorBrightnessIncognito
                                 alpha:1.0]];
-      _incognitoIcon.reset([[UIImageView alloc]
-          initWithImage:[UIImage imageNamed:@"incognito_marker_typing"]]);
+      _incognitoIcon = [[UIImageView alloc]
+          initWithImage:[UIImage imageNamed:@"incognito_marker_typing"]];
       [_incognitoIcon setAlpha:0];
       [_incognitoIcon
           setAutoresizingMask:UIViewAutoresizingFlexibleTrailingMargin()];
       [self layoutIncognitoIcon];
       [_webToolbar addSubview:_incognitoIcon];
     }
   }
 
   [_webToolbar addSubview:_omniBox];
 
   [_backButton setEnabled:NO];
   [_forwardButton setEnabled:NO];
 
   if (idiom == IPAD_IDIOM) {
     // Note that the reload button gets repositioned when -layoutOmnibox is
     // called.
-    _reloadButton.reset([[UIButton alloc]
-        initWithFrame:LayoutRectGetRect(kStopReloadButtonFrame)]);
+    _reloadButton = [[UIButton alloc]
+        initWithFrame:LayoutRectGetRect(kStopReloadButtonFrame)];
     [_reloadButton
         setAutoresizingMask:UIViewAutoresizingFlexibleTrailingMargin() |
                             UIViewAutoresizingFlexibleBottomMargin];
-    _stopButton.reset([[UIButton alloc]
-        initWithFrame:LayoutRectGetRect(kStopReloadButtonFrame)]);
+    _stopButton = [[UIButton alloc]
+        initWithFrame:LayoutRectGetRect(kStopReloadButtonFrame)];
     [_stopButton
         setAutoresizingMask:UIViewAutoresizingFlexibleTrailingMargin() |
                             UIViewAutoresizingFlexibleBottomMargin];
-    _starButton.reset(
-        [[UIButton alloc] initWithFrame:LayoutRectGetRect(kStarButtonFrame)]);
+    _starButton =
+        [[UIButton alloc] initWithFrame:LayoutRectGetRect(kStarButtonFrame)];
     [_starButton setAutoresizingMask:UIViewAutoresizingFlexibleBottomMargin |
                                      UIViewAutoresizingFlexibleLeadingMargin()];
-    _voiceSearchButton.reset([[UIButton alloc]
-        initWithFrame:LayoutRectGetRect(kVoiceSearchButtonFrame)]);
+    _voiceSearchButton = [[UIButton alloc]
+        initWithFrame:LayoutRectGetRect(kVoiceSearchButtonFrame)];
     [_voiceSearchButton
         setAutoresizingMask:UIViewAutoresizingFlexibleBottomMargin |
                             UIViewAutoresizingFlexibleLeadingMargin()];
     [_webToolbar addSubview:_voiceSearchButton];
     [_webToolbar addSubview:_starButton];
     [_webToolbar addSubview:_stopButton];
     [_webToolbar addSubview:_reloadButton];
     [self setUpButton:_voiceSearchButton
            withImageEnum:WebToolbarButtonNameVoice
          forInitialState:UIControlStateNormal
@@ skipping 26 matching lines @@
       hasDisabledImage:YES
          synchronously:NO];
   [self setUpButton:_forwardButton
          withImageEnum:WebToolbarButtonNameForward
        forInitialState:UIControlStateDisabled
       hasDisabledImage:YES
          synchronously:NO];
 
   _backButtonMode = ToolbarButtonModeNormal;
   _forwardButtonMode = ToolbarButtonModeNormal;
-  base::scoped_nsobject<UILongPressGestureRecognizer> backLongPress(
+  UILongPressGestureRecognizer* backLongPress =
       [[UILongPressGestureRecognizer alloc]
           initWithTarget:self
-                  action:@selector(handleLongPress:)]);
+                  action:@selector(handleLongPress:)];
   [_backButton addGestureRecognizer:backLongPress];
-  base::scoped_nsobject<UILongPressGestureRecognizer> forwardLongPress(
+  UILongPressGestureRecognizer* forwardLongPress =
       [[UILongPressGestureRecognizer alloc]
           initWithTarget:self
-                  action:@selector(handleLongPress:)]);
+                  action:@selector(handleLongPress:)];
   [_forwardButton addGestureRecognizer:forwardLongPress];
 
   // TODO(leng):  Consider moving this to a pak file as well.  For now,
   // because it is also used by find_bar_controller_ios, leave it as is.
   NSString* imageName =
       _incognito ? @"omnibox_transparent_background" : @"omnibox_background";
   [_omniboxBackground setImage:StretchableImageNamed(imageName, 12, 12)];
   [_omniBox setAutoresizingMask:UIViewAutoresizingFlexibleWidth |
                                 UIViewAutoresizingFlexibleBottomMargin];
   [_reloadButton addTarget:self
@@ skipping 27 matching lines @@
                                    UIViewAutoresizingFlexibleBottomMargin];
   [_webToolbar setFrame:[self specificControlsArea]];
   _locationBar = base::MakeUnique<LocationBarControllerImpl>(
       _omniBox, _browserState, preloader, self, self);
 
   // Create the determinate progress bar (phone only).
   if (idiom == IPHONE_IDIOM) {
     CGFloat progressWidth = self.view.frame.size.width;
     CGFloat progressHeight = 0;
     progressHeight = kMaterialProgressBarHeight;
-    _determinateProgressView.reset([[MDCProgressView alloc] init]);
-    _determinateProgressView.get().hidden = YES;
+    _determinateProgressView = [[MDCProgressView alloc] init];
+    _determinateProgressView.hidden = YES;
     [_determinateProgressView
         setProgressTintColor:[MDCPalette cr_bluePalette].tint500];
     [_determinateProgressView
         setTrackTintColor:[MDCPalette cr_bluePalette].tint100];
     int progressBarYOffset =
         floor(progressHeight / 2) + kDeterminateProgressBarYOffset;
     int progressBarY = self.view.bounds.size.height - progressBarYOffset;
     CGRect progressBarFrame =
         CGRectMake(0, progressBarY, progressWidth, progressHeight);
     [_determinateProgressView setFrame:progressBarFrame];
@@ skipping 43 matching lines @@
 - (void)browserStateDestroyed {
   // The location bar has a browser state reference, so must be destroyed at
   // this point.
   _locationBar.reset();
   _browserState = nullptr;
 }
 
 - (void)dealloc {
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   [_tabHistoryPopupController setDelegate:nil];
-  [super dealloc];
 }
 
 #pragma mark -
 #pragma mark Public methods.
 
 - (void)updateToolbarState {
   ToolbarModelIOS* toolbarModelIOS = [self.delegate toolbarModelIOS];
   if (toolbarModelIOS->IsLoading()) {
     [self showStopButton];
     [self startProgressBar];
@@ skipping 53 matching lines @@
   [_backButton setHidden:NO];
   [_forwardButton setHidden:NO];
   [_omniboxBackground setHidden:NO];
   [self.backgroundView setAlpha:1];
   [self hideViewsForNewTabPage:NO];
   [self updateToolbarState];
 }
 
 - (void)showPrerenderingAnimation {
   _prerenderAnimating = YES;
+  __weak MDCProgressView* weakDeterminateProgressView =
+      _determinateProgressView;
   [_determinateProgressView setProgress:0];
   [_determinateProgressView setHidden:NO
                              animated:YES
                            completion:^(BOOL finished) {
-                             [_determinateProgressView
+                             [weakDeterminateProgressView
                                  setProgress:1
                                     animated:YES
                                   completion:^(BOOL finished) {
-                                    [_determinateProgressView setHidden:YES
-                                                               animated:YES
-                                                             completion:nil];
+                                    [weakDeterminateProgressView setHidden:YES
+                                                                  animated:YES
+                                                                completion:nil];
                                   }];
                            }];
 }
 
 - (void)setControlsHidden:(BOOL)hidden {
   [self setStandardControlsVisible:!hidden];
   [_webToolbar setHidden:hidden];
 }
 
 - (void)setControlsAlpha:(CGFloat)alpha {
   [self setStandardControlsAlpha:alpha];
   [_webToolbar setAlpha:alpha];
 }
 
 - (void)currentPageLoadStarted {
   [self startProgressBar];
 }
 
 - (void)selectedTabChanged {
   [self cancelOmniboxEdit];
 }
 
 - (CGRect)bookmarkButtonAnchorRect {
   // Shrink the padding around the bookmark button so the popovers are anchored
   // correctly.
   return CGRectInset([_starButton bounds], 6, 11);
 }
 
 - (UIView*)bookmarkButtonView {
-  return _starButton.get();
+  return _starButton;
 }
 
 - (CGRect)visibleOmniboxFrame {
-  CGRect frame = _omniboxBackground.get().frame;
+  CGRect frame = _omniboxBackground.frame;
   frame = [self.view.superview convertRect:frame
                                   fromView:[_omniboxBackground superview]];
   // Account for the omnibox background image transparent sides.
   return CGRectInset(frame, -kBackgroundImageVisibleRectOffset, 0);
 }
 
 - (UIImage*)snapshotWithWidth:(CGFloat)width {
   if (IsIPadIdiom())
     return nil;
   // Below call will be no-op if cached snapshot is valid.
   [self updateSnapshotWithWidth:width forced:YES];
-  return [[_snapshot retain] autorelease];
+  return _snapshot;
 }
 
 - (void)showTabHistoryPopupInView:(UIView*)view
                         withItems:(const web::NavigationItemList&)items
                    forBackHistory:(BOOL)isBackHistory {
   if (_tabHistoryPopupController)
     return;
 
   base::RecordAction(UserMetricsAction("MobileToolbarShowTabHistoryMenu"));
 
   UIButton* historyButton = isBackHistory ? _backButton : _forwardButton;
   // Keep the button pressed by swapping the normal and highlighted images.
   [self setImagesForNavButton:historyButton withTabHistoryVisible:YES];
 
   // Set the origin for the tools popup to the leading side of the bottom of the
   // pressed buttons.
   CGRect buttonBounds = [historyButton.imageView bounds];
   CGPoint origin = CGPointMake(CGRectGetLeadingEdge(buttonBounds),
                                CGRectGetMaxY(buttonBounds));
   CGPoint convertedOrigin =
       [view convertPoint:origin fromView:historyButton.imageView];
-  _tabHistoryPopupController.reset([[TabHistoryPopupController alloc]
-      initWithOrigin:convertedOrigin
-          parentView:view
-               items:items]);
+  _tabHistoryPopupController =
+      [[TabHistoryPopupController alloc] initWithOrigin:convertedOrigin
+                                             parentView:view
+                                                  items:items];
   [_tabHistoryPopupController setDelegate:self];
 
   // Fade in the popup and notify observers.
   CGRect containerFrame = [[_tabHistoryPopupController popupContainer] frame];
   CGPoint destination = CGPointMake(CGRectGetLeadingEdge(containerFrame),
                                     CGRectGetMinY(containerFrame));
   [_tabHistoryPopupController fadeInPopupFromSource:convertedOrigin
                                       toDestination:destination];
   [[NSNotificationCenter defaultCenter]
       postNotificationName:kTabHistoryPopupWillShowNotification
                     object:nil];
 }
 
 - (void)dismissTabHistoryPopup {
   if (!_tabHistoryPopupController)
     return;
-  TabHistoryPopupController* tempTHPC = _tabHistoryPopupController.get();
+  TabHistoryPopupController* tempTHPC = _tabHistoryPopupController;
   [tempTHPC containerView].userInteractionEnabled = NO;
   [tempTHPC dismissAnimatedWithCompletion:^{
     // Unpress the back/forward button by restoring the normal and
     // highlighted images to their usual state.
     [self setImagesForNavButton:_backButton withTabHistoryVisible:NO];
     [self setImagesForNavButton:_forwardButton withTabHistoryVisible:NO];
     // Reference tempTHPC so the block retains it.

[sdefresne, 2017/04/28 08:02:50]

Followup: I always find the "[foo self]" strange; can we change this in a
followup CL to the following syntax (that should be semantically identical):

  __block TabHistoryPopupController* tempTHPC = _tabHistoryPopupController;
  [tempTHPC dismissAnimatedWithCompletion:^{
    ...
    // Reference tempTHPC so the block retains it.
    tempTHPC = nil;
  }];

     [tempTHPC self];
   }];
   // reset _tabHistoryPopupController to prevent -applicationDidEnterBackground
   // from posting another kTabHistoryPopupWillHideNotification.
-  _tabHistoryPopupController.reset();
+  _tabHistoryPopupController = nil;
 
   [[NSNotificationCenter defaultCenter]
       postNotificationName:kTabHistoryPopupWillHideNotification
                     object:nil];
 }
 
 - (BOOL)isOmniboxFirstResponder {
   return [_omniBox isFirstResponder];
 }
 
 - (BOOL)showingOmniboxPopup {
   OmniboxViewIOS* omniboxViewIOS =
       static_cast<OmniboxViewIOS*>(_locationBar.get()->GetLocationEntry());
   return omniboxViewIOS->IsPopupOpen();
 }
 
 - (void)traitCollectionDidChange:(UITraitCollection*)previousTraitCollection {
   [super traitCollectionDidChange:previousTraitCollection];
-  _lastKnownTraitCollection.reset([[UITraitCollection
-      traitCollectionWithTraitsFromCollections:@[ self.view.traitCollection ]]
-      retain]);
+  _lastKnownTraitCollection = [UITraitCollection
+      traitCollectionWithTraitsFromCollections:@[ self.view.traitCollection ]];
   if (IsIPadIdiom()) {
     // Update toolbar accessory views.
     BOOL isCompactTabletView = IsCompactTablet(self.view);
     [_voiceSearchButton setHidden:isCompactTabletView];
     [_starButton setHidden:isCompactTabletView];
     [_reloadButton setHidden:isCompactTabletView];
     [_stopButton setHidden:isCompactTabletView];
     [self updateToolbarState];
 
     // Update keyboard accessory views.
     BOOL hidden = [_keyboardVoiceSearchButton isHidden];
-    _keyBoardAccessoryView.reset();
+    _keyBoardAccessoryView = nil;
     [_omniBox setInputAccessoryView:[self keyboardAccessoryView]];
     [_keyboardVoiceSearchButton setHidden:hidden];
     if ([_omniBox isFirstResponder]) {
       [_omniBox reloadInputViews];
     }
 
     // Re-layout toolbar and omnibox.
     [_webToolbar setFrame:[self specificControlsArea]];
     [self layoutOmnibox];
   }
 }
 
 #pragma mark -
 #pragma mark Overridden superclass methods.
 
 - (void)applicationDidEnterBackground:(NSNotification*)notify {
   if (_tabHistoryPopupController) {
     // Dismiss the tab history popup without animation.
     [self setImagesForNavButton:_backButton withTabHistoryVisible:NO];
     [self setImagesForNavButton:_forwardButton withTabHistoryVisible:NO];
-    _tabHistoryPopupController.reset(nil);
+    _tabHistoryPopupController = nil;
     [[NSNotificationCenter defaultCenter]
         postNotificationName:kTabHistoryPopupWillHideNotification
                       object:nil];
   }
   [super applicationDidEnterBackground:notify];
 }
 
 - (void)setUpButton:(UIButton*)button
        withImageEnum:(int)imageEnum
      forInitialState:(UIControlState)initialState
     hasDisabledImage:(BOOL)hasDisabledImage
        synchronously:(BOOL)synchronously {
   [super setUpButton:button
          withImageEnum:imageEnum
        forInitialState:initialState
       hasDisabledImage:hasDisabledImage
          synchronously:synchronously];
 
-  if (button != _starButton.get())
+  if (button != _starButton)
     return;
   // The star button behaves slightly differently.  It uses the pressed
   // image for its selected state as well as its pressed state.
   void (^starBlock)(void) = ^{
     UIImage* starImage = [self imageForImageEnum:WebToolbarButtonNameStar
                                         forState:ToolbarButtonUIStatePressed];
     [_starButton setAdjustsImageWhenHighlighted:NO];
     [_starButton setImage:starImage forState:UIControlStateSelected];
   };
   if (synchronously) {
     starBlock();
   } else {
     dispatch_time_t addImageDelay =
         dispatch_time(DISPATCH_TIME_NOW, kNonInitialImageAdditionDelayNanosec);
     dispatch_after(addImageDelay, dispatch_get_main_queue(), starBlock);
   }
 }
 
 - (void)standardButtonPressed:(UIButton*)sender {
   [super standardButtonPressed:sender];
   [self cancelOmniboxEdit];
 }
 
 - (IBAction)recordUserMetrics:(id)sender {
-  if (sender == _backButton.get()) {
+  if (sender == _backButton) {
     base::RecordAction(UserMetricsAction("MobileToolbarBack"));
-  } else if (sender == _forwardButton.get()) {
+  } else if (sender == _forwardButton) {
     base::RecordAction(UserMetricsAction("MobileToolbarForward"));
-  } else if (sender == _reloadButton.get()) {
+  } else if (sender == _reloadButton) {
     base::RecordAction(UserMetricsAction("MobileToolbarReload"));
-  } else if (sender == _stopButton.get()) {
+  } else if (sender == _stopButton) {
     base::RecordAction(UserMetricsAction("MobileToolbarStop"));
-  } else if (sender == _voiceSearchButton.get()) {
+  } else if (sender == _voiceSearchButton) {
     base::RecordAction(UserMetricsAction("MobileToolbarVoiceSearch"));
-  } else if (sender == _keyboardVoiceSearchButton.get()) {
+  } else if (sender == _keyboardVoiceSearchButton) {
     base::RecordAction(UserMetricsAction("MobileCustomRowVoiceSearch"));
-  } else if (sender == _starButton.get()) {
+  } else if (sender == _starButton) {
     base::RecordAction(UserMetricsAction("MobileToolbarToggleBookmark"));
   } else {
     [super recordUserMetrics:sender];
   }
 }
 
 - (IBAction)stackButtonTouchDown:(id)sender {
   [self.delegate prepareToEnterTabSwitcher:self];
 }
 
 - (BOOL)imageShouldFlipForRightToLeftLayoutDirection:(int)imageEnum {
   DCHECK(imageEnum < NumberOfWebToolbarButtonNames);
   if (imageEnum < NumberOfToolbarButtonNames)
     return [super imageShouldFlipForRightToLeftLayoutDirection:imageEnum];
   if (imageEnum == WebToolbarButtonNameBack ||
       imageEnum == WebToolbarButtonNameForward ||
       imageEnum == WebToolbarButtonNameReload ||
       imageEnum == WebToolbarButtonNameCallingApp) {
     return YES;
   }
   return NO;
 }
 
 - (int)imageEnumForButton:(UIButton*)button {
-  if (button == _voiceSearchButton.get())
+  if (button == _voiceSearchButton)
     return _isTTSPlaying ? WebToolbarButtonNameTTS : WebToolbarButtonNameVoice;
-  if (button == _starButton.get())
+  if (button == _starButton)
     return WebToolbarButtonNameStar;
-  if (button == _stopButton.get())
+  if (button == _stopButton)
     return WebToolbarButtonNameStop;
-  if (button == _reloadButton.get())
+  if (button == _reloadButton)
     return WebToolbarButtonNameReload;
-  if (button == _backButton.get())
+  if (button == _backButton)
     return WebToolbarButtonNameBack;
-  if (button == _forwardButton.get())
+  if (button == _forwardButton)
     return WebToolbarButtonNameForward;
   return [super imageEnumForButton:button];
 }
 
 - (int)imageIdForImageEnum:(int)index
                      style:(ToolbarControllerStyle)style
                   forState:(ToolbarButtonUIState)state {
   DCHECK(style < ToolbarControllerStyleMaxStyles);
   DCHECK(state < NumberOfToolbarButtonUIStates);
   // Additional checking.  These three buttons should only ever be used on iPad.
@@ skipping 288 matching lines @@
 }
 
 - (void)locationBarBeganEdit {
   [self.delegate locationBarBeganEdit:self];
 }
 
 - (void)locationBarChanged {
   // Hide the voice search button once the user starts editing the omnibox but
   // show it if the omnibox is empty.
   bool isEditingOrEmpty = _locationBar->GetLocationEntry()->IsEditingOrEmpty();
-  BOOL editingAndNotEmpty = isEditingOrEmpty && _omniBox.get().text.length != 0;
+  BOOL editingAndNotEmpty = isEditingOrEmpty && _omniBox.text.length != 0;
   // If the voice search button is visible but about to be hidden (i.e.
   // the omnibox is no longer empty) then this is the first omnibox text so
   // record a user action.
   if (![_keyboardVoiceSearchButton isHidden] && editingAndNotEmpty) {
     base::RecordAction(UserMetricsAction("MobileFirstTextInOmnibox"));
   }
   [_keyboardVoiceSearchButton setHidden:editingAndNotEmpty];
 }
 
 - (web::WebState*)getWebState {
@@ skipping 143 matching lines @@
                                     _omniBox);
   }
 }
 
 #pragma mark -
 #pragma mark Private methods.
 
 - (UIButton*)cancelButton {
   if (_cancelButton)
     return _cancelButton;
-  _cancelButton.reset([[UIButton buttonWithType:UIButtonTypeCustom] retain]);
+  _cancelButton = [UIButton buttonWithType:UIButtonTypeCustom];
   NSString* collapseName = _incognito ? @"collapse_incognito" : @"collapse";
   [_cancelButton setImage:[UIImage imageNamed:collapseName]
                  forState:UIControlStateNormal];
   NSString* collapsePressedName =
       _incognito ? @"collapse_pressed_incognito" : @"collapse_pressed";
   [_cancelButton setImage:[UIImage imageNamed:collapsePressedName]
                  forState:UIControlStateHighlighted];
   [_cancelButton setAccessibilityLabel:l10n_util::GetNSString(IDS_CANCEL)];
   [_cancelButton setAutoresizingMask:UIViewAutoresizingFlexibleLeadingMargin() |
                                      UIViewAutoresizingFlexibleHeight];
@@ skipping 135 matching lines @@
     [_determinateProgressView setHidden:NO animated:YES completion:nil];
   }
 }
 
 - (void)stopProgressBar {
   if (_determinateProgressView && ![_determinateProgressView isHidden]) {
     // Update the toolbar snapshot, but only after the progress bar has
     // disappeared.
 
     if (!_prerenderAnimating) {
+      __weak MDCProgressView* weakDeterminateProgressView =
+          _determinateProgressView;
       // Calling -completeAndHide while a prerender animation is in progress
       // will result in hiding the progress bar before the animation is
       // complete.
       [_determinateProgressView setProgress:1
                                    animated:YES
                                  completion:^(BOOL finished) {
-                                   [_determinateProgressView setHidden:YES
-                                                              animated:YES
-                                                            completion:nil];
+                                   [weakDeterminateProgressView setHidden:YES
+                                                                 animated:YES
+                                                               completion:nil];
                                  }];
     }
     CGFloat delay = _unitTesting ? 0 : kLoadCompleteHideProgressBarDelay;
     [self performSelector:@selector(hideProgressBarAndTakeSnapshot)
                withObject:nil
                afterDelay:delay];
   }
 }
 
 - (void)hideProgressBarAndTakeSnapshot {
@@ skipping 44 matching lines @@
   // Size changes matter.
   hash ^= static_cast<uint32_t>(width) << 15;
   hash ^= static_cast<uint32_t>([self view].frame.size.height) << 23;
   return hash;
 }
 
 - (void)handleLongPress:(UILongPressGestureRecognizer*)gesture {
   if (gesture.state != UIGestureRecognizerStateBegan)
     return;
 
-  if (gesture.view == _backButton.get()) {
-    base::scoped_nsobject<GenericChromeCommand> command(
-        [[GenericChromeCommand alloc] initWithTag:IDC_SHOW_BACK_HISTORY]);
+  if (gesture.view == _backButton) {
+    GenericChromeCommand* command =
+        [[GenericChromeCommand alloc] initWithTag:IDC_SHOW_BACK_HISTORY];
     [_backButton chromeExecuteCommand:command];
-  } else if (gesture.view == _forwardButton.get()) {
-    base::scoped_nsobject<GenericChromeCommand> command(
-        [[GenericChromeCommand alloc] initWithTag:IDC_SHOW_FORWARD_HISTORY]);
+  } else if (gesture.view == _forwardButton) {
+    GenericChromeCommand* command =
+        [[GenericChromeCommand alloc] initWithTag:IDC_SHOW_FORWARD_HISTORY];
     [_forwardButton chromeExecuteCommand:command];
   }
 }
 
 - (void)setImagesForNavButton:(UIButton*)button
         withTabHistoryVisible:(BOOL)tabHistoryVisible {
   BOOL isBackButton = button == _backButton;
   ToolbarButtonMode newMode =
       tabHistoryVisible ? ToolbarButtonModeReversed : ToolbarButtonModeNormal;
   if (isBackButton && newMode == _backButtonMode)
     return;
   if (!isBackButton && newMode == _forwardButtonMode)
     return;
 
-  base::scoped_nsobject<UIImage> normalImage(
-      [[button imageForState:UIControlStateNormal] retain]);
-  base::scoped_nsobject<UIImage> highlightedImage(
-      [[button imageForState:UIControlStateHighlighted] retain]);
+  UIImage* normalImage = [button imageForState:UIControlStateNormal];
+  UIImage* highlightedImage = [button imageForState:UIControlStateHighlighted];
   [button setImage:highlightedImage forState:UIControlStateNormal];
   [button setImage:normalImage forState:UIControlStateHighlighted];
   if (isBackButton)
     _backButtonMode = newMode;
   else
     _forwardButtonMode = newMode;
 }
 
 - (void)audioReadyForPlayback:(NSNotification*)notification {
   if (![_voiceSearchButton isHidden]) {
@@ skipping 122 matching lines @@
   if (_keyBoardAccessoryView)
     return _keyBoardAccessoryView;
 
   const BOOL isTablet = IsIPadIdiom() && !IsCompactTablet(self.view);
 
   // TODO(pinkerton): purge this view when low memory.
   CGFloat width = [[UIScreen mainScreen] bounds].size.width;
   CGFloat height = isTablet ? kViewHeightTablet : kViewHeightPhone;
   CGRect frame = CGRectMake(0.0, 0.0, width, height);
 
-  _keyBoardAccessoryView.reset([[KeyboardAccessoryView alloc]
-       initWithFrame:frame
-      inputViewStyle:UIInputViewStyleKeyboard]);
+  _keyBoardAccessoryView =
+      [[KeyboardAccessoryView alloc] initWithFrame:frame
+                                    inputViewStyle:UIInputViewStyleKeyboard];
   [_keyBoardAccessoryView setAutoresizingMask:UIViewAutoresizingFlexibleWidth];
 
   NSArray* buttonTitles =
       [NSArray arrayWithObjects:@":", @".", @"-", @"/", kDotComTLD, nil];
 
   // Center buttons in available space by placing them within a parent view
   // that auto-centers.
   CGFloat betweenButtonSpacing =
       isTablet ? kBetweenButtonSpacing : kBetweenButtonSpacingPhone;
   const CGFloat buttonWidth = isTablet ? kButtonSizeXTablet : kButtonSizeXPhone;
 
   CGFloat totalWidth = (buttonTitles.count * buttonWidth) +
                        ((buttonTitles.count - 1) * betweenButtonSpacing);
   CGFloat indent = floor((width - totalWidth) / 2.0);
   if (indent < kButtonInset)
     indent = kButtonInset;
   CGRect parentViewRect = CGRectMake(indent, 0.0, totalWidth, height);
-  base::scoped_nsobject<UIView> parentView(
-      [[UIView alloc] initWithFrame:parentViewRect]);
+  UIView* parentView = [[UIView alloc] initWithFrame:parentViewRect];
   [parentView setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin |
                                   UIViewAutoresizingFlexibleRightMargin];
   [_keyBoardAccessoryView addSubview:parentView];
 
   // Create the buttons, starting at the left edge of |parentView|.
   CGRect currentFrame =
       CGRectMake(0.0, kButtonInset, buttonWidth,
                  isTablet ? kButtonSizeYTablet : kButtonSizeYPhone);
 
   for (NSString* title in buttonTitles) {
     UIView* button = [self keyboardButtonWithTitle:title frame:currentFrame];
     [parentView addSubview:button];
     currentFrame.origin.x = CGRectGetMaxX(currentFrame) + betweenButtonSpacing;
   }
 
   // Create the voice search button and add it to _keyBoardAccessoryView over
   // the text buttons.
-  _keyboardVoiceSearchButton.reset(
-      [[UIButton buttonWithType:UIButtonTypeCustom] retain]);
+  _keyboardVoiceSearchButton = [UIButton buttonWithType:UIButtonTypeCustom];
   [_keyboardVoiceSearchButton
       setAutoresizingMask:UIViewAutoresizingFlexibleWidth];
   [_keyboardVoiceSearchButton setTag:IDC_VOICE_SEARCH];
   SetA11yLabelAndUiAutomationName(_keyboardVoiceSearchButton,
                                   IDS_IOS_ACCNAME_VOICE_SEARCH,
                                   @"Voice Search");
   // TODO(leng): Consider moving these icons into a pak file.
   UIImage* voiceRow = [UIImage imageNamed:@"custom_row_voice"];
   UIImage* voiceRowPressed = [UIImage imageNamed:@"custom_row_voice_pressed"];
   [_keyboardVoiceSearchButton setBackgroundImage:voiceRow
@@ skipping 21 matching lines @@
                          forControlEvents:UIControlEventTouchDown];
   } else {
     [_keyboardVoiceSearchButton addTarget:self
                                    action:@selector(ignoreVoiceSearch:)
                          forControlEvents:UIControlEventTouchUpInside];
   }
 
   [_keyBoardAccessoryView addSubview:_keyboardVoiceSearchButton];
 
   // Reset the external keyboard watcher.
-  _hardwareKeyboardWatcher.reset([[HardwareKeyboardWatcher alloc]
-      initWithAccessoryView:_keyBoardAccessoryView]);
+  _hardwareKeyboardWatcher = [[HardwareKeyboardWatcher alloc]
+      initWithAccessoryView:_keyBoardAccessoryView];
 
   return _keyBoardAccessoryView;
 }
 
 - (void)preloadVoiceSearch:(id)sender {
   DCHECK(ios::GetChromeBrowserProvider()
              ->GetVoiceSearchProvider()
              ->IsVoiceSearchEnabled());
   [sender removeTarget:self
                 action:@selector(preloadVoiceSearch:)
       forControlEvents:UIControlEventTouchDown];
 
   // Use a GenericChromeCommand because |sender| already has a tag set for a
   // different command.
-  base::scoped_nsobject<GenericChromeCommand> command(
-      [[GenericChromeCommand alloc] initWithTag:IDC_PRELOAD_VOICE_SEARCH]);
+  GenericChromeCommand* command =
+      [[GenericChromeCommand alloc] initWithTag:IDC_PRELOAD_VOICE_SEARCH];
   [sender chromeExecuteCommand:command];
 }
 
 // Called when the keyboard voice search button is tapped with voice search
 // disabled.  Hides the voice search button but takes no other action.
 - (void)ignoreVoiceSearch:(id)sender {
   [_keyboardVoiceSearchButton setHidden:YES];
 }
 
 - (CGFloat)omniboxLeading {
@@ skipping 482 matching lines @@
   // If |width| is 0, the current view's width is acceptable.
   if (width < 1)
     width = [self view].frame.size.width;
 
   // Snapshot is not used on the iPad.
   if (IsIPadIdiom()) {
     NOTREACHED();
     return;
   }
   // If the snapshot is valid, don't redraw.
-  if (_snapshot.get() && _snapshotHash == [self snapshotHashWithWidth:width])
+  if (_snapshot && _snapshotHash == [self snapshotHashWithWidth:width])
     return;
 
   // Don't update the snapshot while the progress bar is moving, or while the
   // tools menu is open, unless |force| is true.
   BOOL shouldRedraw = force || ([self toolsPopupController] == nil &&
                                 [_determinateProgressView isHidden]);
   if (!shouldRedraw)
     return;
 
   if ([[self delegate]
           respondsToSelector:@selector(willUpdateToolbarSnapshot)]) {
     [[self delegate] willUpdateToolbarSnapshot];
   }
 
   // Temporarily resize the toolbar if necessary in order to match the desired
   // width. (Such a mismatch can occur if the device has been rotated while this
   // view was not visible, for example.)
   CGRect frame = [self view].frame;
   CGFloat oldWidth = frame.size.width;
   frame.size.width = width;
   [self view].frame = frame;
 
   UIGraphicsBeginImageContextWithOptions(frame.size, NO, 0.0);
   [[self view].layer renderInContext:UIGraphicsGetCurrentContext()];
-  _snapshot.reset([UIGraphicsGetImageFromCurrentImageContext() retain]);
+  _snapshot = UIGraphicsGetImageFromCurrentImageContext();
   UIGraphicsEndImageContext();
 
   // In the past, when the current tab was prerendered, taking a snapshot
   // sometimes lead to layout of its UIWebView. As this may be the fist time
   // the UIWebViews was layed out, its scroll view was scrolled. This lead
   // to scroll events that changed the frame of the toolbar when fullscreen
   // was enabled.
   // DCHECK that the toolbar frame does not change while taking a snapshot.
   DCHECK_EQ(frame.origin.x, [self view].frame.origin.x);
   DCHECK_EQ(frame.origin.y, [self view].frame.origin.y);
@@ skipping 54 matching lines @@
 
 - (BOOL)isLoading {
   return ![_determinateProgressView isHidden];
 }
 
 - (BOOL)isPrerenderAnimationRunning {
   return _prerenderAnimating;
 }
 
 - (OmniboxTextFieldIOS*)omnibox {
-  return _omniBox.get();
+  return _omniBox;
 }
 
 @end