Finished swap out of old API

chrome/browser/ui/cocoa/infobars/alternate_nav_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 "chrome/browser/ui/cocoa/infobars/alternate_nav_infobar_controller.h"
 
 #include "base/logging.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h"
 #include "chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h"
@@ skipping 11 matching lines @@
 //
 - (void)addAdditionalControls {
   // No buttons.
   [self removeButtons];
 
   AlternateNavInfoBarDelegate* delegate =
       static_cast<AlternateNavInfoBarDelegate*>([self delegate]);
   DCHECK(delegate);
   size_t offset = base::string16::npos;
   base::string16 message = delegate->GetMessageTextWithOffset(&offset);
-  base::string16 link = delegate->GetLinkText();
+  NSMutableString* finalMessage =

[groby-ooo-7-16, 2015/01/30 23:08:39]

I'd suggest doing the string composition in C++ instead of objc, it's a bit more
succinct, skipping the intermediate NSMutableString. I.e:

base::string16 message = delegate->GetTextMessageWithOffset(&offset);
base::string16 linkText = delegate->GetLinkText(); 
message.insert(offset, linkText);
....
[view setMessage:base::SysUTF16ToNSString(message)
             withFont:font
     messageColor:[NSColor blackColor]];
[view addLinkRange: NSMakeRange(offset, linkText.size()]

(I prefer to postpone type conversion until it is absolutely necessary, as well)

[shrike, 2015/02/02 17:39:13]

I agree. Done.

+      [NSMutableString stringWithString:base::SysUTF16ToNSString(message)];
+  NSString* link = base::SysUTF16ToNSString(delegate->GetLinkText());
+  [finalMessage insertString:link atIndex:offset];
   NSFont* font = [NSFont labelFontOfSize:
-                  [NSFont systemFontSizeForControlSize:NSRegularControlSize]];
+                    [NSFont systemFontSizeForControlSize:NSRegularControlSize]];
   HyperlinkTextView* view = (HyperlinkTextView*)label_.get();
-  [view setMessageAndLink:base::SysUTF16ToNSString(message)
-                 withLink:base::SysUTF16ToNSString(link)
-                 atOffset:offset
-                     font:font
-             messageColor:[NSColor blackColor]
-                linkColor:[NSColor blueColor]];
+  [view setMessage:finalMessage withFont:font messageColor:[NSColor blackColor]];
+  [view addLinkRange:NSMakeRange(offset, [link length])
+            withName:@""
+           linkColor:[NSColor blueColor]];
 }
 
 // Called when someone clicks on the link in the infobar.  This method
 // is called by the InfobarTextField on its delegate (the
 // AlternateNavInfoBarController).
 - (void)linkClicked {
   if (![self isOwned])
     return;
   WindowOpenDisposition disposition =
       ui::WindowOpenDispositionFromNSEvent([NSApp currentEvent]);
   AlternateNavInfoBarDelegate* delegate =
       static_cast<AlternateNavInfoBarDelegate*>([self delegate]);
   if (delegate->LinkClicked(disposition))
     [self removeSelf];
 }
 
 @end
 
 // static
 scoped_ptr<infobars::InfoBar> AlternateNavInfoBarDelegate::CreateInfoBar(
     scoped_ptr<AlternateNavInfoBarDelegate> delegate) {
   scoped_ptr<InfoBarCocoa> infobar(new InfoBarCocoa(delegate.Pass()));
   base::scoped_nsobject<AlternateNavInfoBarController> controller(
       [[AlternateNavInfoBarController alloc] initWithInfoBar:infobar.get()]);
   infobar->set_controller(controller);
   return infobar.Pass();
 }