Upstream NSString+CrStringDrawing changes.

ui/gfx/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/gfx/ios/NSString+CrStringDrawing.h"
 
 #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"
 
 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
@@ skipping 122 matching lines @@
 
       // Verify that the pixel-aligned value is pixel-aligned.
       EXPECT_FLOAT_EQ(roundf(size_with_pixel_aligned.width * scale),
                       size_with_pixel_aligned.width * scale) << test_tag;
       EXPECT_FLOAT_EQ(roundf(size_with_pixel_aligned.height * scale),
                       size_with_pixel_aligned.height * scale) << test_tag;
     }
   }
 }
 
+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