Finished swap out of old API

ui/base/cocoa/controls/hyperlink_text_view_unittest.mm

 // Copyright (c) 2011 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.
 
 #include "base/mac/scoped_nsobject.h"
 #include "testing/gtest_mac.h"
 #import "ui/base/cocoa/controls/hyperlink_text_view.h"
 #import "ui/gfx/test/ui_cocoa_test_helper.h"
 
 namespace {
@@ skipping 46 matching lines @@
 
 TEST_VIEW(HyperlinkTextViewTest, view_);
 
 TEST_F(HyperlinkTextViewTest, TestViewConfiguration) {
   EXPECT_FALSE([view_ isEditable]);
   EXPECT_FALSE([view_ drawsBackground]);
   EXPECT_FALSE([view_ isHorizontallyResizable]);
   EXPECT_FALSE([view_ isVerticallyResizable]);
 }
 
-TEST_F(HyperlinkTextViewTest, LinkInsertion) {
-  // Test that setMessage:withLink:... inserts the link text.
-  [view_ setMessageAndLink:@"This is a short text message"
-                  withLink:@"alarmingly "
-                  atOffset:10
-                      font:GetDefaultFont()
-              messageColor:[NSColor blackColor]
-                 linkColor:[NSColor blueColor]];
-  EXPECT_NSEQ(@"This is a alarmingly short text message",
-              [[view_ textStorage] string]);
-
-  // Test insertion at end - most common use case.
-  NSString* message=@"This is another test message ";
-  [view_ setMessageAndLink:message
-                  withLink:@"with link"
-                  atOffset:[message length]
-                      font:GetDefaultFont()
-              messageColor:[NSColor blackColor]
-                 linkColor:[NSColor blueColor]];
-  EXPECT_NSEQ(@"This is another test message with link",
-              [[view_ textStorage] string]);
-}
-
-TEST_F(HyperlinkTextViewTest, AttributesForMessageWithLink) {
-  // Verifies text attributes are set as expected for setMessageWithLink:...
-  [view_ setMessageAndLink:@"aaabbbbb"
-                  withLink:@"xxxx"
-                  atOffset:3
-                      font:GetDefaultFont()
-              messageColor:[NSColor blackColor]
-                 linkColor:[NSColor blueColor]];
-
-  NSDictionary* attributes;
-  NSRange rangeLimit = NSMakeRange(0, 12);
-  NSRange range;
-  attributes = [[view_ textStorage] attributesAtIndex:0
-                                longestEffectiveRange:&range
-                                              inRange:rangeLimit];
-  EXPECT_EQ(0U, range.location);
-  EXPECT_EQ(3U, range.length);
-  EXPECT_NSEQ(GetDefaultTextAttributes(), attributes);
-
-  attributes = [[view_ textStorage] attributesAtIndex:3
-                                longestEffectiveRange:&range
-                                              inRange:rangeLimit];
-  EXPECT_EQ(3U, range.location);
-  EXPECT_EQ(4U, range.length);
-  EXPECT_NSEQ(GetDefaultLinkAttributes(), attributes);
-
-  attributes = [[view_ textStorage] attributesAtIndex:7
-                                longestEffectiveRange:&range
-                                              inRange:rangeLimit];
-  EXPECT_EQ(7U, range.location);
-  EXPECT_EQ(5U, range.length);
-  EXPECT_NSEQ(GetDefaultTextAttributes(), attributes);
-
-}
-
 TEST_F(HyperlinkTextViewTest, TestSetMessage) {
   // Verifies setMessage sets text and attributes properly.
   NSString* message = @"Test message";
   [view_ setMessage:message
            withFont:GetDefaultFont()
        messageColor:[NSColor blackColor]];
   EXPECT_NSEQ(@"Test message", [[view_ textStorage] string]);
 
   NSDictionary* attributes;
   NSRange rangeLimit = NSMakeRange(0, [message length]);
@@ skipping 53 matching lines @@
 
 TEST_F(HyperlinkTextViewTest, FirstResponderBehavior) {
   // By default, accept.
   EXPECT_TRUE([view_ acceptsFirstResponder]);
 
   [view_ setRefusesFirstResponder:YES];
   EXPECT_FALSE([view_ acceptsFirstResponder]);
 }
 
 }  // namespace