Fix ManualTextFramerTest.OriginRTLTest on iOS 11

ios/chrome/browser/ui/util/manual_text_framer_unittest.mm

 // Copyright 2015 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 "ios/chrome/browser/ui/util/manual_text_framer.h"
 
+#include "base/ios/ios_util.h"
 #include "base/mac/foundation_util.h"
 #include "base/time/time.h"
 #import "ios/chrome/browser/ui/util/core_text_util.h"
 #import "ios/chrome/browser/ui/util/text_frame.h"
 #import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 #include "url/gurl.h"
 
@@ skipping 174 matching lines @@
           @"\u0644\u064e\u0639\u064e\u0644\u064e\u0643\u0650\u0020\u062a\u064e"
           @"\u062a\u064e\u0639\u064e\u0644\u0651\u064e\u0645\u064e\u0020\u0627"
           @"\u0644\u062d\u0650\u0631\u0652\u0635\u064e\u0020\u0639\u064e\u0644"
           @"\u064e\u0649\u0020\u0627\u0644\u0648\u064e\u0642\u0652\u062a\u0650"
           @"\u0020\u002e\u0020\u0641\u064e\u0627\u0644\u062d\u064e\u064a\u064e"
           @"\u0627\u0629\u064f");
   attributes()[NSFontAttributeName] = TypographyFontWithSize(14.0);
   attributes()[NSParagraphStyleAttributeName] = CreateParagraphStyle(
       20.0, NSTextAlignmentNatural, NSLineBreakByWordWrapping);
   ApplyAttributesForRange(text_range());
-  CGRect bounds = CGRectMake(0, 0, 100.0, 60.0);
+  CGRect bounds = base::ios::IsRunningOnIOS11OrLater()

[kkhorimoto, 2017/06/12 19:42:03]

Can we separate the width calculation out and add some commenting?  Something
like:

// The bounds width is chosen so that the RTL string above
// is laid out into 3 lines.  The font that iOS 11 uses for Arabic
// strings takes more horizontal space, so the bounds width
// is increased accordingly.
CGFloat width = base::ios::IsRunningOnIOS11OrLater() ? 130.0 : 100.0;

[lpromero, 2017/06/13 08:10:25]

Done.

+                      ? CGRectMake(0, 0, 130.0, 60.0)
+                      : CGRectMake(0, 0, 100.0, 60.0);
   FrameTextInBounds(bounds);
   CheckForLineCountAndFramedRange(3, text_range());
   for (FramedLine* line in text_frame().lines) {
     ExpectNearPoint(
         CGRectGetMaxX(bounds),
         line.origin.x + core_text_util::GetTrimmedLineWidth(line.line));
   }
 }
 
 TEST_F(ManualTextFramerTest, CJKLineBreakTest) {
@@ skipping 68 matching lines @@
            "\u062A\u0639\u0637\u064A\u0644\u0020\u0647\u0630\u0647\u0020\u0627"
            "\u0644\u062E\u062F\u0645\u0627\u062A\u002E");
   attributes()[NSFontAttributeName] = [UIFont systemFontOfSize:20.0];
   ApplyAttributesForRange(text_range());
   CGRect bounds = CGRectMake(0, 0, 500, 100);
   FrameTextInBounds(bounds);
   CheckForLineCountAndFramedRange(2, text_range());
 }
 
 }  // namespace