Change target+selector for block in InfoBarView

ios/chrome/browser/infobars/confirm_infobar_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/infobars/confirm_infobar_controller.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
@@ skipping 101 matching lines @@
   if (_confirmInfobarDelegate->GetLinkText().length()) {
     base::string16 msgLink = base::SysNSStringToUTF16([[view class]
         stringAsLink:base::SysUTF16ToNSString(
                          _confirmInfobarDelegate->GetLinkText())
                  tag:ConfirmInfoBarUITags::TITLE_LINK]);
     base::string16 messageText = _confirmInfobarDelegate->GetMessageText();
     base::ReplaceFirstSubstringAfterOffset(
         &messageText, 0, _confirmInfobarDelegate->GetLinkText(), msgLink);
 
     [view addLabel:base::SysUTF16ToNSString(messageText)
-            target:self
-            action:@selector(infobarLinkDidPress:)];
+            action:^(NSUInteger tag) {
+              [self infobarLinkDidPress:tag];

[sdefresne, 2017/04/21 14:19:24]

This block has a strong reference to "self". Thus "view" could be gaining a
strong reference to "self". Since -addLabel:target:action: also used to keep a
reference on "target", this does not change anything and the block is not
creating a cycle that did not exists before.

[gambard, 2017/04/21 14:54:48]

Yes, I tried to keep the current behavior.

+            }];
   } else {
     NSString* label =
         base::SysUTF16ToNSString(_confirmInfobarDelegate->GetMessageText());
     [view addLabel:label];
   }
 }
 
 #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 (!self.delegate) {
     return;
   }
   if ([sender isKindOfClass:[UIButton class]]) {
     NSUInteger tag = static_cast<UIButton*>(sender).tag;
     if (tag == ConfirmInfoBarUITags::CLOSE)
       self.delegate->InfoBarDidCancel();
     else
       self.delegate->InfoBarButtonDidPress(UITagToButton(tag));
   }
 }
 
 // Title link was clicked.
-- (void)infobarLinkDidPress:(NSNumber*)tag {
-  DCHECK([tag isKindOfClass:[NSNumber class]]);
+- (void)infobarLinkDidPress:(NSUInteger)tag {
   if (!self.delegate) {
     return;
   }
-  if ([tag unsignedIntegerValue] == ConfirmInfoBarUITags::TITLE_LINK) {
+  if (tag == ConfirmInfoBarUITags::TITLE_LINK) {
     _confirmInfobarDelegate->LinkClicked(
         WindowOpenDisposition::NEW_FOREGROUND_TAB);
   }
 }
 
 @end