Add NSString category for providing iOS6-style string drawing APIs.

ui/ios/NSString+CrStringDrawing_unittest.mm

+// Copyright 2014 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 "ui/ios/NSString+CrStringDrawing.h"
+
+#include "base/mac/scoped_nsobject.h"
+#include "base/strings/sys_string_conversions.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
+
+namespace {
+
+typedef PlatformTest NSStringCrStringDrawing;
+
+// These tests verify that the category methods return the same values as the
+// deprecated methods, so ignore warnings about using deprecated methods.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+
+TEST_F(NSStringCrStringDrawing, testIntegralSizeWithFont) {

[stuartmorgan, 2014/08/28 15:18:14]

Remove "test" from the name.

[lliabraa, 2014/08/28 19:25:06]

Done.

+  NSArray* fonts = @[
+    [NSNull null],
+    [UIFont systemFontOfSize:16],
+    [UIFont boldSystemFontOfSize:10],
+    [UIFont fontWithName:@"Helvetica" size:12.0],
+  ];
+  for (UIFont* font in fonts) {
+    if ([font isEqual:[NSNull null]])
+      font = nil;
+    std::string fontTag = "with font ";
+    fontTag.append(base::SysNSStringToUTF8(font ? [font description] : @"nil"));
+    EXPECT_EQ([@"" sizeWithFont:font].width,
+              [@"" cr_integralSizeWithFont:font].width) << fontTag;
+    EXPECT_EQ([@"" sizeWithFont:font].height,
+              [@"" cr_integralSizeWithFont:font].height) << fontTag;
+    EXPECT_EQ([@"Test" sizeWithFont:font].width,
+              [@"Test" cr_integralSizeWithFont:font].width) << fontTag;
+    EXPECT_EQ([@"Test" sizeWithFont:font].height,
+              [@"Test" cr_integralSizeWithFont:font].height) << fontTag;
+    EXPECT_EQ([@"你好" sizeWithFont:font].width,
+              [@"你好" cr_integralSizeWithFont:font].width) << fontTag;
+    EXPECT_EQ([@"你好" sizeWithFont:font].height,
+              [@"你好" cr_integralSizeWithFont:font].height) << fontTag;
+    NSString* longString = @"★ This is a test string that is very long.";
+    EXPECT_EQ([longString sizeWithFont:font].width,
+              [longString cr_integralSizeWithFont:font].width) << fontTag;
+    EXPECT_EQ([longString sizeWithFont:font].height,
+              [longString cr_integralSizeWithFont:font].height) << fontTag;
+  }
+}
+
+#pragma clang diagnostic pop  // ignored "-Wdeprecated-declarations"
+
+}  // namespace