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

ios/chrome/browser/ui/toolbar/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/toolbar_controller.h"
 
 #include <QuartzCore/QuartzCore.h>
 
 #include "base/format_macros.h"
 #include "base/i18n/rtl.h"
@@ skipping 58 matching lines @@
 
 // Macros for creating CGRects of height H, origin (0,0), with the portrait
 // width of phone/pad devices.
 // clang-format off
 #define IPHONE_FRAME(H) { { 0, 0 }, { kPortraitWidth[IPHONE_IDIOM], H } }
 #define IPAD_FRAME(H)   { { 0, 0 }, { kPortraitWidth[IPAD_IDIOM],   H } }
 
 // Makes a two-element C array of CGRects as described above, one for each
 // device idiom.
 #define FRAME_PAIR(H) { IPHONE_FRAME(H), IPAD_FRAME(H) }
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
 // clang-format on
 
 const CGRect kToolbarFrame[INTERFACE_IDIOM_COUNT] = FRAME_PAIR(56);
 
 namespace {
 
 // Color constants for the stack button text, normal and pressed states.  These
 // arrays are indexed by ToolbarControllerStyle enum values.
 const CGFloat kStackButtonNormalColors[] = {
     85.0 / 255.0,   // ToolbarControllerStyleLightMode
@@ skipping 105 matching lines @@
   // explicit transition animations.
   if (self.animatingTransition)
     return (id<CAAction>)[NSNull null];
   return [super actionForLayer:layer forKey:event];
 }
 
 @end
 
 @interface ToolbarController () {
   // The top-level toolbar view.
-  base::scoped_nsobject<ToolbarView> view_;
+  ToolbarView* view_;

[stkhapugin, 2017/04/10 15:57:51]

You should be able to synthesize the first three ivars and toolsPopupController_
and remove getters

   // The view for the toolbar background image.
-  base::scoped_nsobject<UIImageView> backgroundView_;
-  base::scoped_nsobject<UIImageView> shadowView_;
-  base::scoped_nsobject<UIImageView> fullBleedShadowView_;
+  UIImageView* backgroundView_;
+  UIImageView* shadowView_;
+  UIImageView* fullBleedShadowView_;
 
   // The backing object for |self.transitionLayers|.
-  base::scoped_nsobject<NSMutableArray> transitionLayers_;
+  NSMutableArray* transitionLayers_;
 
-  base::scoped_nsobject<ToolbarToolsMenuButton> toolsMenuButton_;
-  base::scoped_nsobject<UIButton> stackButton_;
-  base::scoped_nsobject<UIButton> shareButton_;
-  base::scoped_nsobject<NSArray> standardButtons_;
-  base::scoped_nsobject<ToolsMenuButtonObserverBridge>
-      toolsMenuButtonObserverBridge_;
+  ToolbarToolsMenuButton* toolsMenuButton_;
+  UIButton* stackButton_;
+  UIButton* shareButton_;
+  NSArray* standardButtons_;
+  ToolsMenuButtonObserverBridge* toolsMenuButtonObserverBridge_;
   ToolbarControllerStyle style_;
 
   // The following is nil if not visible.
-  base::scoped_nsobject<ToolsPopupController> toolsPopupController_;
+  ToolsPopupController* toolsPopupController_;
 }
 
 // Returns the background image that should be used for |style|.
 - (UIImage*)getBackgroundImageForStyle:(ToolbarControllerStyle)style;
 
 // Whether the share button should be visible in the toolbar.
 - (BOOL)shareButtonShouldBeVisible;
 
 // Update share button visibility and |standardButtons_| array.
 - (void)updateStandardButtons;
@@ skipping 11 matching lines @@
 
 @implementation ToolbarController
 
 @synthesize readingListModel = readingListModel_;
 
 @synthesize style = style_;
 
 - (void)setReadingListModel:(ReadingListModel*)readingListModel {
   readingListModel_ = readingListModel;
   if (readingListModel_) {
-    toolsMenuButtonObserverBridge_.reset([[ToolsMenuButtonObserverBridge alloc]
-        initWithModel:readingListModel_
-        toolbarButton:toolsMenuButton_]);
+    toolsMenuButtonObserverBridge_ =
+        [[ToolsMenuButtonObserverBridge alloc] initWithModel:readingListModel_
+                                               toolbarButton:toolsMenuButton_];
   }
 }
 
 - (instancetype)initWithStyle:(ToolbarControllerStyle)style {
   self = [super init];
   if (self) {
     style_ = style;
     DCHECK_LT(style_, ToolbarControllerStyleMaxStyles);
 
     InterfaceIdiom idiom = IsIPadIdiom() ? IPAD_IDIOM : IPHONE_IDIOM;
     CGRect viewFrame = kToolbarFrame[idiom];
     CGRect backgroundFrame = kBackgroundViewFrame[idiom];
     CGRect stackButtonFrame = LayoutRectGetRect(kStackButtonFrame);
     CGRect toolsMenuButtonFrame =
         LayoutRectGetRect(kToolsMenuButtonFrame[idiom]);
 
     if (idiom == IPHONE_IDIOM) {
       CGFloat statusBarOffset = [self statusBarOffset];
       viewFrame.size.height += statusBarOffset;
       backgroundFrame.size.height += statusBarOffset;
       stackButtonFrame.origin.y += statusBarOffset;
       toolsMenuButtonFrame.origin.y += statusBarOffset;
     }
 
-    view_.reset([[ToolbarView alloc] initWithFrame:viewFrame]);
-    backgroundView_.reset([[UIImageView alloc] initWithFrame:backgroundFrame]);
-    toolsMenuButton_.reset([[ToolbarToolsMenuButton alloc]
-        initWithFrame:toolsMenuButtonFrame
-                style:style_]);
+    view_ = [[ToolbarView alloc] initWithFrame:viewFrame];
+    backgroundView_ = [[UIImageView alloc] initWithFrame:backgroundFrame];
+    toolsMenuButton_ =
+        [[ToolbarToolsMenuButton alloc] initWithFrame:toolsMenuButtonFrame
+                                                style:style_];
     [toolsMenuButton_ setTag:IDC_SHOW_TOOLS_MENU];
     [toolsMenuButton_
         setAutoresizingMask:UIViewAutoresizingFlexibleLeadingMargin() |
                             UIViewAutoresizingFlexibleBottomMargin];
 
     [view_ addSubview:backgroundView_];
     [view_ addSubview:toolsMenuButton_];
     [view_ setAutoresizingMask:UIViewAutoresizingFlexibleWidth];
     [backgroundView_ setAutoresizingMask:UIViewAutoresizingFlexibleWidth |
                                          UIViewAutoresizingFlexibleHeight];
 
     if (idiom == IPAD_IDIOM) {
       CGRect shareButtonFrame = LayoutRectGetRect(kShareMenuButtonFrame);
-      shareButton_.reset([[UIButton alloc] initWithFrame:shareButtonFrame]);
+      shareButton_ = [[UIButton alloc] initWithFrame:shareButtonFrame];
       [shareButton_ setTag:IDC_SHARE_PAGE];
       [shareButton_
           setAutoresizingMask:UIViewAutoresizingFlexibleLeadingMargin() |
                               UIViewAutoresizingFlexibleBottomMargin];
       [self setUpButton:shareButton_
              withImageEnum:ToolbarButtonNameShare
            forInitialState:UIControlStateNormal
           hasDisabledImage:YES
              synchronously:NO];
       SetA11yLabelAndUiAutomationName(shareButton_, IDS_IOS_TOOLS_MENU_SHARE,
                                       kToolbarShareButtonIdentifier);
       [view_ addSubview:shareButton_];
     }
 
     CGRect shadowFrame = kShadowViewFrame[idiom];
     shadowFrame.origin.y = CGRectGetMaxY(backgroundFrame);
-    shadowView_.reset([[UIImageView alloc] initWithFrame:shadowFrame]);
+    shadowView_ = [[UIImageView alloc] initWithFrame:shadowFrame];
     [shadowView_ setAutoresizingMask:UIViewAutoresizingFlexibleWidth];
     [shadowView_ setUserInteractionEnabled:NO];
     [view_ addSubview:shadowView_];
     [shadowView_ setImage:NativeImage(IDR_IOS_TOOLBAR_SHADOW)];
 
     if (idiom == IPHONE_IDIOM) {
       // iPad omnibox does not expand to full bleed.
       CGRect fullBleedShadowFrame = kFullBleedShadowViewFrame;
       fullBleedShadowFrame.origin.y = shadowFrame.origin.y;
-      fullBleedShadowView_.reset(
-          [[UIImageView alloc] initWithFrame:fullBleedShadowFrame]);
+      fullBleedShadowView_ =
+          [[UIImageView alloc] initWithFrame:fullBleedShadowFrame];
       [fullBleedShadowView_
           setAutoresizingMask:UIViewAutoresizingFlexibleWidth];
       [fullBleedShadowView_ setUserInteractionEnabled:NO];
       [fullBleedShadowView_ setAlpha:0];
       [view_ addSubview:fullBleedShadowView_];
       [fullBleedShadowView_
           setImage:NativeImage(IDR_IOS_TOOLBAR_SHADOW_FULL_BLEED)];
     }
 
-    transitionLayers_.reset(
-        [[NSMutableArray alloc] initWithCapacity:kTransitionLayerCapacity]);
+    transitionLayers_ =
+        [[NSMutableArray alloc] initWithCapacity:kTransitionLayerCapacity];
 
     // UIImageViews do not default to userInteractionEnabled:YES.
     [view_ setUserInteractionEnabled:YES];
     [backgroundView_ setUserInteractionEnabled:YES];
 
     UIImage* tile = [self getBackgroundImageForStyle:style];
     [[self backgroundView]
         setImage:StretchableImageFromUIImage(tile, 0.0, 3.0)];
 
     if (idiom == IPHONE_IDIOM) {
-      stackButton_.reset(
-          [[ToolbarCenteredButton alloc] initWithFrame:stackButtonFrame]);
+      stackButton_ =
+          [[ToolbarCenteredButton alloc] initWithFrame:stackButtonFrame];
       [stackButton_ setTag:IDC_TOGGLE_TAB_SWITCHER];
       [[stackButton_ titleLabel]
           setFont:[self fontForSize:kFontSizeFewerThanTenTabs]];
       [stackButton_
           setTitleColor:[UIColor colorWithWhite:kStackButtonNormalColors[style_]
                                           alpha:1.0]
                forState:UIControlStateNormal];
       UIColor* highlightColor =
           UIColorFromRGB(kStackButtonHighlightedColors[style_], 1.0);
       [stackButton_ setTitleColor:highlightColor
@@ skipping 39 matching lines @@
   return nil;
 }
 
 - (UIFont*)fontForSize:(NSInteger)size {
   return [[MDFRobotoFontLoader sharedInstance] boldFontOfSize:size];
 }
 
 - (void)dealloc {
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   [toolsPopupController_ setDelegate:nil];
-  [super dealloc];
 }
 
 - (UIImageView*)view {
-  return view_.get();
+  return view_;
 }
 
 - (UIImageView*)backgroundView {
-  return backgroundView_.get();
+  return backgroundView_;
 }
 
 - (CGFloat)statusBarOffset {
   return StatusBarHeight();
 }
 
 - (UIImageView*)shadowView {
-  return shadowView_.get();
+  return shadowView_;
 }
 
 - (NSMutableArray*)transitionLayers {
-  return transitionLayers_.get();
+  return transitionLayers_;
 }
 
 - (BOOL)imageShouldFlipForRightToLeftLayoutDirection:(int)imageEnum {
   // None of the images this class knows about should flip.
   return NO;
 }
 
 - (void)updateStandardButtons {
   BOOL shareButtonShouldBeVisible = [self shareButtonShouldBeVisible];
   [shareButton_ setHidden:!shareButtonShouldBeVisible];
   NSMutableArray* standardButtons = [NSMutableArray array];
   [standardButtons addObject:toolsMenuButton_];
   if (stackButton_)
     [standardButtons addObject:stackButton_];
   if (shareButtonShouldBeVisible)
     [standardButtons addObject:shareButton_];
-  standardButtons_.reset([standardButtons retain]);
+  standardButtons_ = standardButtons;
 }
 
 - (void)traitCollectionDidChange:(UITraitCollection*)previousTraitCollection {
   [self updateStandardButtons];
 }
 
 - (ToolsPopupController*)toolsPopupController {
-  return toolsPopupController_.get();
+  return toolsPopupController_;
 }
 
 - (void)applicationDidEnterBackground:(NSNotification*)notify {
-  if (toolsPopupController_.get()) {
+  if (toolsPopupController_) {
     // Dismiss the tools popup menu without animation.
     [toolsMenuButton_ setToolsMenuIsVisible:NO];
-    toolsPopupController_.reset(nil);
+    toolsPopupController_ = nil;
     [[NSNotificationCenter defaultCenter]
         postNotificationName:kMenuWillHideNotification
                       object:nil];
   }
 }
 
 - (BOOL)shareButtonShouldBeVisible {
   // The share button only exists on iPad, and when some tabs are visible
   // (i.e. when not in DarkMode), and when the width is greater than
   // the tablet mini view.
@@ skipping 10 matching lines @@
 
 - (UIImage*)imageForImageEnum:(int)imageEnum
                      forState:(ToolbarButtonUIState)state {
   int imageID =
       [self imageIdForImageEnum:imageEnum style:[self style] forState:state];
   return NativeReversableImage(
       imageID, [self imageShouldFlipForRightToLeftLayoutDirection:imageEnum]);
 }
 
 - (int)imageEnumForButton:(UIButton*)button {
-  if (button == stackButton_.get())
+  if (button == stackButton_)
     return ToolbarButtonNameStack;
   return NumberOfToolbarButtonNames;
 }
 
 - (int)imageIdForImageEnum:(int)index
                      style:(ToolbarControllerStyle)style
                   forState:(ToolbarButtonUIState)state {
   DCHECK(index < NumberOfToolbarButtonNames);
   DCHECK(style < ToolbarControllerStyleMaxStyles);
   DCHECK(state < NumberOfToolbarButtonUIStates);
@@ skipping 52 matching lines @@
     if (synchronously || initialState == UIControlStateDisabled) {
       disabledImageBlock();
     } else {
       dispatch_after(addImageDelay, dispatch_get_main_queue(),
                      disabledImageBlock);
     }
   }
 }
 
 - (void)registerEventsForButton:(UIButton*)button {
-  if (button != toolsMenuButton_.get()) {
+  if (button != toolsMenuButton_) {
     // |target| must be |self| (as opposed to |nil|) because |self| isn't in the
     // responder chain.
     [button addTarget:self
                   action:@selector(standardButtonPressed:)
         forControlEvents:UIControlEventTouchUpInside];
   }
   [button addTarget:self
                 action:@selector(recordUserMetrics:)
       forControlEvents:UIControlEventTouchUpInside];
   [button addTarget:button
                 action:@selector(chromeExecuteCommand:)
       forControlEvents:UIControlEventTouchUpInside];
 }
 
 - (CGRect)shareButtonAnchorRect {
   // Shrink the padding around the shareButton so the popovers are anchored
   // correctly.
   return CGRectInset([shareButton_ bounds], 10, 0);
 }
 
 - (UIView*)shareButtonView {
-  return shareButton_.get();
+  return shareButton_;
 }
 
 - (void)showToolsMenuPopupWithConfiguration:
     (ToolsMenuConfiguration*)configuration {
   // Because an animation hides and shows the tools popup menu it is possible to
   // tap the tools button multiple times before the tools menu is shown. Ignore
   // repeated taps between animations.
   if (toolsPopupController_)
     return;
 
   base::RecordAction(UserMetricsAction("ShowAppMenu"));
 
   // Keep the button pressed.
   [toolsMenuButton_ setToolsMenuIsVisible:YES];
 
   [configuration setToolsMenuButton:toolsMenuButton_];
-  toolsPopupController_.reset(
-      [[ToolsPopupController alloc] initWithConfiguration:configuration]);
+  toolsPopupController_ =
+      [[ToolsPopupController alloc] initWithConfiguration:configuration];
 
   [toolsPopupController_ setDelegate:self];
 
   [[NSNotificationCenter defaultCenter]
       postNotificationName:kMenuWillShowNotification
                     object:nil];
 }
 
 - (void)dismissToolsMenuPopup {
-  if (!toolsPopupController_.get())
+  if (!toolsPopupController_)
     return;
-  ToolsPopupController* tempTPC = toolsPopupController_.get();
+  ToolsPopupController* tempTPC = toolsPopupController_;
   [tempTPC containerView].userInteractionEnabled = NO;
   [tempTPC dismissAnimatedWithCompletion:^{
     // Unpress the tools menu button by restoring the normal and
     // highlighted images to their usual state.
     [toolsMenuButton_ setToolsMenuIsVisible:NO];
     // Reference tempTPC so the block retains it.
     [tempTPC self];
   }];
   // reset tabHistoryPopupController_ to prevent -applicationDidEnterBackground
   // from posting another kMenuWillHideNotification.
-  toolsPopupController_.reset();
+  toolsPopupController_ = nil;
 
   [[NSNotificationCenter defaultCenter]
       postNotificationName:kMenuWillHideNotification
                     object:nil];
 }
 
 - (UIImage*)getBackgroundImageForStyle:(ToolbarControllerStyle)style {
   int backgroundImageID;
   if (style == ToolbarControllerStyleLightMode)
     backgroundImageID = IDR_IOS_TOOLBAR_LIGHT_BACKGROUND;
@@ skipping 38 matching lines @@
   // Animate the opacity of the buttons to 0.
   [CATransaction begin];
   [CATransaction setAnimationDuration:ios::material::kDuration2];
   [CATransaction
       setAnimationTimingFunction:TimingFunction(ios::material::CurveEaseIn)];
   CABasicAnimation* fadeButtons =
       [CABasicAnimation animationWithKeyPath:@"opacity"];
   fadeButtons.fromValue = @1;
   fadeButtons.toValue = @0;
 
-  for (UIButton* button in standardButtons_.get()) {
+  for (UIButton* button in standardButtons_) {
     if (![button isHidden]) {
       [button layer].opacity = 0;
       [[button layer] addAnimation:fadeButtons forKey:@"fade"];
     }
   }
   [CATransaction commit];
 
   // Animate the buttons 10 pixels in the leading-to-trailing direction
   [CATransaction begin];
   [CATransaction setAnimationDuration:ios::material::kDuration1];
   [CATransaction
       setAnimationTimingFunction:TimingFunction(ios::material::CurveEaseIn)];
 
-  for (UIButton* button in standardButtons_.get()) {
+  for (UIButton* button in standardButtons_) {
     CABasicAnimation* shiftButton =
         [CABasicAnimation animationWithKeyPath:@"position"];
     CGPoint startPosition = [button layer].position;
     CGPoint endPosition =
         CGPointLayoutOffset(startPosition, kButtonFadeOutXOffset);
     shiftButton.fromValue = [NSValue valueWithCGPoint:startPosition];
     shiftButton.toValue = [NSValue valueWithCGPoint:endPosition];
     [[button layer] addAnimation:shiftButton forKey:@"shiftButton"];
   }
 
   [CATransaction commit];
 
   // Fade to the full bleed shadow.
   [UIView animateWithDuration:ios::material::kDuration1
                    animations:^{
                      [shadowView_ setAlpha:0];
                      [fullBleedShadowView_ setAlpha:1];
                    }];
 }
 
 - (void)fadeInStandardControls {
-  for (UIButton* button in standardButtons_.get()) {
+  for (UIButton* button in standardButtons_) {
     [self fadeInView:button
         fromLeadingOffset:10
              withDuration:ios::material::kDuration2
                afterDelay:ios::material::kDuration1];
   }
 
   // Fade to the normal shadow.
   [UIView animateWithDuration:ios::material::kDuration1
                    animations:^{
                      [shadowView_ setAlpha:self.backgroundView.alpha];
                      [fullBleedShadowView_ setAlpha:0];
                    }];
 }
 
 - (void)animationDidStart:(CAAnimation*)anim {
   // Once the buttons start fading in, set their opacity to 1 so there's no
   // flicker at the end of the animation.
-  for (UIButton* button in standardButtons_.get()) {
+  for (UIButton* button in standardButtons_) {
     if (anim == [[button layer] animationForKey:@"fadeIn"]) {
       [button layer].opacity = 1;
       return;
     }
   }
 }
 
 - (void)fadeInView:(UIView*)view
     fromLeadingOffset:(LayoutOffset)leadingOffset
          withDuration:(NSTimeInterval)duration
@@ skipping 173 matching lines @@
                           transitionStyle:style];
 }
 
 - (void)hideViewsForNewTabPage:(BOOL)hide {
   DCHECK(!IsIPadIdiom());
   [shadowView_ setHidden:hide];
 }
 
 - (void)setStandardControlsVisible:(BOOL)visible {
   if (visible) {
-    for (UIButton* button in standardButtons_.get()) {
+    for (UIButton* button in standardButtons_) {
       [button setAlpha:1.0];
     }
   } else {
-    for (UIButton* button in standardButtons_.get()) {
+    for (UIButton* button in standardButtons_) {
       [button setAlpha:0.0];
     }
   }
 }
 
 - (void)setStandardControlsAlpha:(CGFloat)alpha {
-  for (UIButton* button in standardButtons_.get()) {
+  for (UIButton* button in standardButtons_) {
     if (![button isHidden])
       [button setAlpha:alpha];
   }
 }
 
 - (void)setBackgroundAlpha:(CGFloat)alpha {
   [backgroundView_ setAlpha:alpha];
   [shadowView_ setAlpha:alpha];
 }
 
 - (void)setStandardControlsTransform:(CGAffineTransform)transform {
-  for (UIButton* button in standardButtons_.get()) {
+  for (UIButton* button in standardButtons_) {
     [button setTransform:transform];
   }
 }
 
 - (void)standardButtonPressed:(UIButton*)sender {
   // This check for valid button images assumes that the buttons all have a
   // different image for the highlighted state as for the normal state.
   // Currently, that assumption is true.
   if ([sender imageForState:UIControlStateHighlighted] ==
       [sender imageForState:UIControlStateNormal]) {
@@ skipping 37 matching lines @@
       [[stackButton_ titleLabel]
           setFont:[self fontForSize:kFontSizeTenTabsOrMore]];
     }
   }
 
   [stackButton_ setTitle:stackButtonTitle forState:UIControlStateNormal];
   [stackButton_ setAccessibilityValue:stackButtonValue];
 }
 
 - (IBAction)recordUserMetrics:(id)sender {
-  if (sender == toolsMenuButton_.get())
+  if (sender == toolsMenuButton_)
     base::RecordAction(UserMetricsAction("MobileToolbarShowMenu"));
-  else if (sender == stackButton_.get())
+  else if (sender == stackButton_)
     base::RecordAction(UserMetricsAction("MobileToolbarShowStackView"));
-  else if (sender == shareButton_.get())
+  else if (sender == shareButton_)
     base::RecordAction(UserMetricsAction("MobileToolbarShareMenu"));
   else
     NOTREACHED();
 }
 
 - (IBAction)stackButtonTouchDown:(id)sender {
   // Exists only for override by subclasses.
 }
 
 + (CGFloat)toolbarDropShadowHeight {
@@ skipping 16 matching lines @@
 #pragma mark -
 #pragma mark PopupMenuDelegate methods.
 
 - (void)dismissPopupMenu:(PopupMenuController*)controller {
   if ([controller isKindOfClass:[ToolsPopupController class]] &&
       (ToolsPopupController*)controller == toolsPopupController_)
     [self dismissToolsMenuPopup];
 }
 
 @end