Cleanup unnecessary code in canvas_skia

ui/views/controls/label_unittest.cc

 // Copyright (c) 2012 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 "ui/views/controls/label.h"
 
 #include "base/i18n/rtl.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/accessibility/ax_view_state.h"
@@ skipping 339 matching lines @@
 
   // GetPreferredSize and borders.
   label.SetBounds(0, 0, 0, 0);
   gfx::Size required_size_with_border = label.GetPreferredSize();
   EXPECT_EQ(required_size_with_border.height(),
             required_size.height() + border.height());
   EXPECT_EQ(required_size_with_border.width(),
             required_size.width() + border.width());
 }
 
-TEST_F(LabelTest, DirectionalityFromText) {
-  Label label;
-  label.SetBounds(0, 0, 1000, 1000);
-
-  // Test text starts with RTL character.
-  label.SetText(base::WideToUTF16(L"  \x5d0\x5d1\x5d2 abc"));
-  const Label::DrawStringParams* params = label.CalculateDrawStringParams();
-  EXPECT_EQ(gfx::Canvas::FORCE_RTL_DIRECTIONALITY,
-            params->flags & (gfx::Canvas::FORCE_RTL_DIRECTIONALITY |
-                             gfx::Canvas::FORCE_LTR_DIRECTIONALITY));
-
-  // Test text starts with LTR character.
-  label.SetText(base::WideToUTF16(L"ltr \x5d0\x5d1\x5d2 abc"));
-  params = label.CalculateDrawStringParams();
-  EXPECT_EQ(gfx::Canvas::FORCE_LTR_DIRECTIONALITY,
-            params->flags & (gfx::Canvas::FORCE_RTL_DIRECTIONALITY |
-                             gfx::Canvas::FORCE_LTR_DIRECTIONALITY));
-}
-
 TEST_F(LabelTest, DrawSingleLineString) {
   Label label;
   label.SetFocusable(false);
 
   label.SetText(ASCIIToUTF16("Here's a string with no returns."));
   gfx::Size required_size(label.GetPreferredSize());
   gfx::Size extra(22, 8);
   label.SetBounds(0, 0, required_size.width() + extra.width(),
                   required_size.height() + extra.height());
 
@@ skipping 116 matching lines @@
                   label.height() + extra.height());
 
   // Do some basic verifications for all three alignments.
   const Label::DrawStringParams* params = label.CalculateDrawStringParams();
   EXPECT_EQ(label.text(), params->text);
   EXPECT_EQ(extra.width() / 2, params->bounds.x());
   EXPECT_EQ(extra.height() / 2, params->bounds.y());
   EXPECT_GT(params->bounds.width(), kMinTextDimension);
   EXPECT_GT(params->bounds.height(), kMinTextDimension);
   int expected_flags = gfx::Canvas::MULTI_LINE |
-                       gfx::Canvas::TEXT_ALIGN_CENTER |
-                       gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
+                       gfx::Canvas::TEXT_ALIGN_CENTER;
 #if !defined(OS_WIN)
   expected_flags |= gfx::Canvas::NO_ELLIPSIS;
 #endif
   EXPECT_EQ(expected_flags, expected_flags);
   gfx::Rect center_bounds(params->bounds);
 
   label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
   label.ResetLayoutCache();
   params = label.CalculateDrawStringParams();
   EXPECT_EQ(label.text(), params->text);
   EXPECT_EQ(0, params->bounds.x());
   EXPECT_EQ(extra.height() / 2, params->bounds.y());
   EXPECT_GT(params->bounds.width(), kMinTextDimension);
   EXPECT_GT(params->bounds.height(), kMinTextDimension);
   expected_flags = gfx::Canvas::MULTI_LINE |
-                   gfx::Canvas::TEXT_ALIGN_LEFT |
-                   gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
+                   gfx::Canvas::TEXT_ALIGN_LEFT;
 #if !defined(OS_WIN)
   expected_flags |= gfx::Canvas::NO_ELLIPSIS;
 #endif
   EXPECT_EQ(expected_flags, expected_flags);
 
   label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
   label.ResetLayoutCache();
   params = label.CalculateDrawStringParams();
   EXPECT_EQ(label.text(), params->text);
   EXPECT_EQ(extra.width(), params->bounds.x());
   EXPECT_EQ(extra.height() / 2, params->bounds.y());
   EXPECT_GT(params->bounds.width(), kMinTextDimension);
   EXPECT_GT(params->bounds.height(), kMinTextDimension);
   expected_flags = gfx::Canvas::MULTI_LINE |
-                   gfx::Canvas::TEXT_ALIGN_RIGHT |
-                   gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
+                   gfx::Canvas::TEXT_ALIGN_RIGHT;
 #if !defined(OS_WIN)
   expected_flags |= gfx::Canvas::NO_ELLIPSIS;
 #endif
   EXPECT_EQ(expected_flags, expected_flags);
 
   // Test multiline drawing with a border.
   gfx::Insets border(19, 92, 23, 2);
   label.SetBorder(Border::CreateEmptyBorder(
       border.top(), border.left(), border.bottom(), border.right()));
   label.SizeToFit(0);
   label.SetBounds(label.x(), label.y(),
                   label.width() + extra.width(),
                   label.height() + extra.height());
 
   label.SetHorizontalAlignment(gfx::ALIGN_CENTER);
   label.ResetLayoutCache();
   params = label.CalculateDrawStringParams();
   EXPECT_EQ(label.text(), params->text);
   EXPECT_EQ(border.left() + extra.width() / 2, params->bounds.x());
   EXPECT_EQ(border.top() + extra.height() / 2, params->bounds.y());
   EXPECT_EQ(center_bounds.width(), params->bounds.width());
   EXPECT_EQ(center_bounds.height(), params->bounds.height());
   expected_flags = gfx::Canvas::MULTI_LINE |
-                   gfx::Canvas::TEXT_ALIGN_CENTER |
-                   gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
+                   gfx::Canvas::TEXT_ALIGN_CENTER;
 #if !defined(OS_WIN)
   expected_flags |= gfx::Canvas::NO_ELLIPSIS;
 #endif
   EXPECT_EQ(expected_flags, expected_flags);
 
   label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
   label.ResetLayoutCache();
   params = label.CalculateDrawStringParams();
   EXPECT_EQ(label.text(), params->text);
   EXPECT_EQ(border.left(), params->bounds.x());
   EXPECT_EQ(border.top() + extra.height() / 2, params->bounds.y());
   EXPECT_EQ(center_bounds.width(), params->bounds.width());
   EXPECT_EQ(center_bounds.height(), params->bounds.height());
   expected_flags = gfx::Canvas::MULTI_LINE |
-                   gfx::Canvas::TEXT_ALIGN_LEFT |
-                   gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
+                   gfx::Canvas::TEXT_ALIGN_LEFT;
 #if !defined(OS_WIN)
   expected_flags |= gfx::Canvas::NO_ELLIPSIS;
 #endif
   EXPECT_EQ(expected_flags, expected_flags);
 
   label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
   label.ResetLayoutCache();
   params = label.CalculateDrawStringParams();
   EXPECT_EQ(label.text(), params->text);
   EXPECT_EQ(extra.width() + border.left(), params->bounds.x());
   EXPECT_EQ(border.top() + extra.height() / 2, params->bounds.y());
   EXPECT_EQ(center_bounds.width(), params->bounds.width());
   EXPECT_EQ(center_bounds.height(), params->bounds.height());
   expected_flags = gfx::Canvas::MULTI_LINE |
-                   gfx::Canvas::TEXT_ALIGN_RIGHT |
-                   gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
+                   gfx::Canvas::TEXT_ALIGN_RIGHT;
 #if !defined(OS_WIN)
   expected_flags |= gfx::Canvas::NO_ELLIPSIS;
 #endif
   EXPECT_EQ(expected_flags, expected_flags);
 }
 
 TEST_F(LabelTest, DrawSingleLineStringInRTL) {
   Label label;
   label.SetFocusable(false);
 
@@ skipping 296 matching lines @@
   EXPECT_FALSE(label.GetTooltipHandlerForPoint(gfx::Point(-1, 20)));
   label.SetHandlesTooltips(true);
 
   // GetTooltipHandlerForPoint works should work in child bounds.
   label.SetBounds(2, 2, 10, 10);
   EXPECT_EQ(&label, label.GetTooltipHandlerForPoint(gfx::Point(1, 5)));
   EXPECT_FALSE(label.GetTooltipHandlerForPoint(gfx::Point(3, 11)));
 }
 
 }  // namespace views