Upstream NSString+CrStringDrawing changes.

ui/gfx/ios/NSString+CrStringDrawing_unittest.mm

Index: ui/gfx/ios/NSString+CrStringDrawing_unittest.mm
diff --git a/ui/gfx/ios/NSString+CrStringDrawing_unittest.mm b/ui/gfx/ios/NSString+CrStringDrawing_unittest.mm
index 02fc3c24585a782f0aefc966c21bf2e2a1c97e11..874cdb1421e106e6b6384af179b1d15cb3be2ab2 100644
--- a/ui/gfx/ios/NSString+CrStringDrawing_unittest.mm
+++ b/ui/gfx/ios/NSString+CrStringDrawing_unittest.mm
@@ -6,6 +6,7 @@
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
+#include "testing/gtest_mac.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
@@ -148,4 +149,24 @@ TEST_F(NSStringCrStringDrawing, PixelAlignedSizeWithFont) {
   }
 }
 
+TEST_F(NSStringCrStringDrawing, CutString) {
+  EXPECT_NSEQ(@"foo", [@"foo" cr_stringByCuttingToIndex:4]);
+  EXPECT_NSEQ(@"bar", [@"bar" cr_stringByCuttingToIndex:3]);
+  EXPECT_NSEQ(@"f…", [@"foo" cr_stringByCuttingToIndex:2]);
+  EXPECT_NSEQ(@"…", [@"bar" cr_stringByCuttingToIndex:1]);
+  EXPECT_NSEQ(@"", [@"foo" cr_stringByCuttingToIndex:0]);
+}
+
+TEST_F(NSStringCrStringDrawing, ElideStringToFitInRect) {
+  NSString* result =
+      [@"lorem ipsum dolores" cr_stringByElidingToFitSize:CGSizeZero];
+  EXPECT_NSEQ(@"", result);
+  result = [@"lorem ipsum dolores"
+      cr_stringByElidingToFitSize:CGSizeMake(1000, 1000)];
+  EXPECT_NSEQ(@"lorem ipsum dolores", result);
+  result =
+      [@"lorem ipsum dolores" cr_stringByElidingToFitSize:CGSizeMake(30, 50)];
+  EXPECT_TRUE([@"lorem ipsum dolores" length] > [result length]);
+}
+
 }  // namespace