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

Automatically generated ARCMigrate commit
Notable issues:None
BUG=624363
TEST=None

Review-Url: https://codereview.chromium.org/2808873002
Cr-Commit-Position: refs/heads/master@{#467947}

ios/chrome/browser/ui/toolbar/BUILD.gn

@@ -38,6 +38,7 @@ bundle_data("resources") {
 }
 
 source_set("toolbar") {
+  configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
     "new_tab_button.h",
     "new_tab_button.mm",
@@ -90,6 +91,7 @@ source_set("toolbar") {
     "//ios/chrome/browser/ui/fancy_ui",
     "//ios/chrome/browser/ui/history",
     "//ios/chrome/browser/ui/keyboard",
+    "//ios/chrome/browser/ui/popup_menu",
     "//ios/chrome/browser/ui/qr_scanner",
     "//ios/chrome/browser/ui/tools_menu",
     "//ios/chrome/browser/ui/util",

ios/chrome/browser/ui/toolbar/DEPS

+specific_include_rules = {
+  "^toolbar_model_impl_ios\.mm$": [
+    "+ios/web/web_state/ui/crw_web_controller.h",
+  ],
+}

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

@@ -15,6 +15,10 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
 namespace {
 // Amount by which to inset the button's content.
 const CGFloat kContentInset = 6.0;

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

@@ -6,6 +6,10 @@
 
 #import "ios/chrome/browser/ui/uikit_ui_util.h"
 
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
 namespace toolbar {
 
 // The colors used to tint the buttons in the toolbar.

ios/chrome/browser/ui/toolbar/toolbar_controller.h

@@ -114,18 +114,18 @@ extern const CGRect kToolbarFrame[INTERFACE_IDIOM_COUNT];
 // from also being visible.
 // TODO(blundell): Figure out how to fix this and have the top-level view be a
 // UIView. b/6167700
-@property(nonatomic, readonly, retain) ToolbarView* view;
+@property(nonatomic, readonly, strong) ToolbarView* view;
 // The view for the toolbar background image. This is a subview of |view| to
 // allow clients to alter the transparency of the background image without
 // affecting the other components of the toolbar.
-@property(nonatomic, readonly, retain) UIImageView* backgroundView;
+@property(nonatomic, readonly, strong) UIImageView* backgroundView;
 // The view for the toolbar shadow image.  This is a subview of |view| to allow
 // clients to alter the visibility of the shadow without affecting other
 // components of the toolbar.
-@property(nonatomic, readonly, retain) UIImageView* shadowView;
+@property(nonatomic, readonly, strong) UIImageView* shadowView;
 
 // The tools popup controller. Nil if the tools popup menu is not visible.
-@property(nonatomic, readonly, retain)
+@property(nonatomic, readonly, strong)
     ToolsPopupController* toolsPopupController;
 
 // Style of this toolbar.

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

@@ -20,6 +20,10 @@
 #import "ios/web/public/ssl_status.h"
 #import "ios/web/public/web_state/web_state.h"
 
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
 ToolbarModelDelegateIOS::ToolbarModelDelegateIOS(WebStateList* web_state_list)
     : web_state_list_(web_state_list) {}
 

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

@@ -13,6 +13,11 @@
 #include "ios/chrome/browser/tabs/tab.h"
 #include "ios/chrome/browser/ui/toolbar/toolbar_model_delegate_ios.h"
 #import "ios/web/public/web_state/web_state.h"
+#import "ios/web/web_state/ui/crw_web_controller.h"
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
 
 namespace {
 const size_t kMaxURLDisplayChars = 32 * 1024;

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

@@ -9,6 +9,10 @@
 
 #include "ios/chrome/browser/ui/toolbar/toolbar_button_tints.h"
 
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
 namespace {
 // The number of dots drawn.
 const int kNumberOfDots = 3;
@@ -48,7 +52,7 @@ const CGFloat kLineWidthAtApogee = 3;
   // Whether the reading list contains unseen items.
   BOOL readingListContainsUnseenItems_;
   // The CALayers containing the drawn dots.
-  base::scoped_nsobject<CAShapeLayer> pathLayers_[kNumberOfDots];
+  NSMutableArray<CAShapeLayer*>* pathLayers_;
   // Whether the CALayers are being animated.
   BOOL animationOnGoing_;
 }
@@ -81,6 +85,7 @@ const CGFloat kLineWidthAtApogee = 3;
               forState:UIControlStateNormal];
     [self setTintColor:toolbar::HighlighButtonTint(style_)
               forState:UIControlStateHighlighted];
+    pathLayers_ = [[NSMutableArray alloc] initWithCapacity:kNumberOfDots];
   }
   return self;
 }
@@ -113,7 +118,7 @@ const CGFloat kLineWidthAtApogee = 3;
 
 - (void)initializeShapeLayers {
   for (int i = 0; i < kNumberOfDots; i++) {
-    base::scoped_nsobject<CAShapeLayer>& pathLayer = pathLayers_[i];
+    CAShapeLayer* pathLayer = pathLayers_[i];
     if (pathLayer) {
       [pathLayer removeFromSuperlayer];
     }
@@ -125,7 +130,7 @@ const CGFloat kLineWidthAtApogee = 3;
     [path moveToPoint:CGPointMake(x - kMaxWidthOfSegment * 0.5, y)];
     [path addLineToPoint:CGPointMake(x + kMaxWidthOfSegment * 0.5, y)];
 
-    pathLayer.reset([[CAShapeLayer layer] retain]);
+    pathLayer = [CAShapeLayer layer];
     [pathLayer setFrame:self.bounds];
     [pathLayer setPath:path.CGPath];
     [pathLayer setStrokeColor:[self.tintColor CGColor]];
@@ -134,7 +139,8 @@ const CGFloat kLineWidthAtApogee = 3;
     [pathLayer setLineCap:kCALineCapRound];
     [pathLayer setStrokeStart:kStrokeStartAtRest];
     [pathLayer setStrokeEnd:kStrokeEndAtRest];
-    [self.layer addSublayer:pathLayer.get()];
+    [self.layer addSublayer:pathLayer];
+    pathLayers_[i] = pathLayer;
   }
 }
 
@@ -206,8 +212,7 @@ const CGFloat kLineWidthAtApogee = 3;
 
   // Add four animations for each stroke.
   for (int i = 0; i < kNumberOfDots; i++) {
-    base::scoped_nsobject<CAShapeLayer>& pathLayer = pathLayers_[i];
-    DCHECK(pathLayer.get());
+    CAShapeLayer* pathLayer = pathLayers_[i];
     const int frameStart =
         (kNumberOfDots - i) * kFramesBetweenAnimationOfEachDot;
 

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

@@ -9,13 +9,17 @@
 #include "components/reading_list/core/reading_list_model.h"
 #import "ios/chrome/browser/ui/toolbar/toolbar_tools_menu_button.h"
 
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
 @interface ToolsMenuButtonObserverBridge ()
 - (void)updateButtonWithModel:(const ReadingListModel*)model;
 - (void)buttonPressed:(UIButton*)sender;
 @end
 
 @implementation ToolsMenuButtonObserverBridge {
-  base::scoped_nsobject<ToolbarToolsMenuButton> _button;
+  ToolbarToolsMenuButton* _button;
   ReadingListModel* _model;
   std::unique_ptr<ReadingListModelBridge> _modelBridge;
 }
@@ -24,7 +28,7 @@
                 toolbarButton:(ToolbarToolsMenuButton*)button {
   self = [super init];
   if (self) {
-    _button.reset([button retain]);
+    _button = button;
     _model = readingListModel;
     [_button addTarget:self
                   action:@selector(buttonPressed:)

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

@@ -87,8 +87,8 @@ extern const CGFloat kiPhoneOmniboxPlaceholderColorBrightness;
                         QRScannerViewControllerDelegate,
                         VoiceSearchControllerDelegate>
 
-@property(nonatomic, assign) id<WebToolbarDelegate> delegate;
-@property(nonatomic, assign, readonly) id<UrlLoader> urlLoader;
+@property(nonatomic, weak) id<WebToolbarDelegate> delegate;
+@property(nonatomic, weak, readonly) id<UrlLoader> urlLoader;
 
 // Mark inherited initializer as unavailable.
 - (instancetype)initWithStyle:(ToolbarControllerStyle)style NS_UNAVAILABLE;