Replace Label::Alignment with gfx::HorizontalAlignment

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 "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/canvas.h"
@@ skipping 41 matching lines @@
   SkColor color = SkColorSetARGB(20, 40, 10, 5);
   label.SetAutoColorReadabilityEnabled(false);
   label.SetEnabledColor(color);
   EXPECT_EQ(color, label.enabled_color());
 }
 
 TEST(LabelTest, AlignmentProperty) {
   Label label;
   bool reverse_alignment = base::i18n::IsRTL();
 
-  label.SetHorizontalAlignment(Label::ALIGN_RIGHT);
-  EXPECT_EQ(
-      reverse_alignment ? Label::ALIGN_LEFT : Label::ALIGN_RIGHT,
-      label.horizontal_alignment());
-  label.SetHorizontalAlignment(Label::ALIGN_LEFT);
-  EXPECT_EQ(
-      reverse_alignment ? Label::ALIGN_RIGHT : Label::ALIGN_LEFT,
-      label.horizontal_alignment());
-  label.SetHorizontalAlignment(Label::ALIGN_CENTER);
-  EXPECT_EQ(Label::ALIGN_CENTER, label.horizontal_alignment());
+  label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
+  EXPECT_EQ(reverse_alignment ? gfx::ALIGN_LEFT : gfx::ALIGN_RIGHT,
+            label.horizontal_alignment());
+  label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
+  EXPECT_EQ(reverse_alignment ? gfx::ALIGN_RIGHT : gfx::ALIGN_LEFT,
+            label.horizontal_alignment());
+  label.SetHorizontalAlignment(gfx::ALIGN_CENTER);
+  EXPECT_EQ(gfx::ALIGN_CENTER, label.horizontal_alignment());
 
   // The label's alignment should not be flipped if the directionality mode is
   // AUTO_DETECT_DIRECTIONALITY.
   label.set_directionality_mode(Label::AUTO_DETECT_DIRECTIONALITY);
-  label.SetHorizontalAlignment(Label::ALIGN_RIGHT);
-  EXPECT_EQ(Label::ALIGN_RIGHT, label.horizontal_alignment());
-  label.SetHorizontalAlignment(Label::ALIGN_LEFT);
-  EXPECT_EQ(Label::ALIGN_LEFT, label.horizontal_alignment());
-  label.SetHorizontalAlignment(Label::ALIGN_CENTER);
-  EXPECT_EQ(Label::ALIGN_CENTER, label.horizontal_alignment());
+  label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
+  EXPECT_EQ(gfx::ALIGN_RIGHT, label.horizontal_alignment());
+  label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
+  EXPECT_EQ(gfx::ALIGN_LEFT, label.horizontal_alignment());
+  label.SetHorizontalAlignment(gfx::ALIGN_CENTER);
+  EXPECT_EQ(gfx::ALIGN_CENTER, label.horizontal_alignment());
 }
 
 TEST(LabelTest, DirectionalityModeProperty) {
   Label label;
   EXPECT_EQ(Label::USE_UI_DIRECTIONALITY, label.directionality_mode());
 
   label.set_directionality_mode(Label::AUTO_DETECT_DIRECTIONALITY);
   EXPECT_EQ(Label::AUTO_DETECT_DIRECTIONALITY, label.directionality_mode());
 
   label.set_directionality_mode(Label::USE_UI_DIRECTIONALITY);
@@ skipping 237 matching lines @@
   label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
   EXPECT_EQ(test_text, paint_text);
   // The text should be centered horizontally and vertically.
   EXPECT_EQ(extra.width() / 2, text_bounds.x());
   EXPECT_EQ(extra.height() / 2 , text_bounds.y());
   EXPECT_EQ(required_size.width(), text_bounds.width());
   EXPECT_EQ(required_size.height(), text_bounds.height());
   EXPECT_EQ(gfx::Canvas::FORCE_LTR_DIRECTIONALITY, flags);
 
   // Left aligned text.
-  label.SetHorizontalAlignment(Label::ALIGN_LEFT);
+  label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
   paint_text.clear();
   text_bounds.SetRect(0, 0, 0, 0);
   label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
   EXPECT_EQ(test_text, paint_text);
   // The text should be left aligned horizontally and centered vertically.
   EXPECT_EQ(0, text_bounds.x());
   EXPECT_EQ(extra.height() / 2 , text_bounds.y());
   EXPECT_EQ(required_size.width(), text_bounds.width());
   EXPECT_EQ(required_size.height(), text_bounds.height());
   EXPECT_EQ(gfx::Canvas::FORCE_LTR_DIRECTIONALITY, flags);
 
   // Right aligned text.
-  label.SetHorizontalAlignment(Label::ALIGN_RIGHT);
+  label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
   paint_text.clear();
   text_bounds.SetRect(0, 0, 0, 0);
   label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
   EXPECT_EQ(test_text, paint_text);
   // The text should be right aligned horizontally and centered vertically.
   EXPECT_EQ(extra.width(), text_bounds.x());
   EXPECT_EQ(extra.height() / 2 , text_bounds.y());
   EXPECT_EQ(required_size.width(), text_bounds.width());
   EXPECT_EQ(required_size.height(), text_bounds.height());
   EXPECT_EQ(gfx::Canvas::FORCE_LTR_DIRECTIONALITY, flags);
 
   // Test single line drawing with a border.
   gfx::Insets border(39, 34, 8, 96);
   label.set_border(Border::CreateEmptyBorder(border.top(),
                                              border.left(),
                                              border.bottom(),
                                              border.right()));
 
   gfx::Size required_size_with_border(label.GetPreferredSize());
   EXPECT_EQ(required_size.width() + border.width(),
             required_size_with_border.width());
   EXPECT_EQ(required_size.height() + border.height(),
             required_size_with_border.height());
   label.SetBounds(0,
                   0,
                   required_size_with_border.width() + extra.width(),
                   required_size_with_border.height() + extra.height());
 
   // Centered text with border.
-  label.SetHorizontalAlignment(Label::ALIGN_CENTER);
+  label.SetHorizontalAlignment(gfx::ALIGN_CENTER);
   paint_text.clear();
   text_bounds.SetRect(0, 0, 0, 0);
   label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
   EXPECT_EQ(test_text, paint_text);
   // The text should be centered horizontally and vertically within the border.
   EXPECT_EQ(border.left() + extra.width() / 2, text_bounds.x());
   EXPECT_EQ(border.top() + extra.height() / 2 , text_bounds.y());
   EXPECT_EQ(required_size.width(), text_bounds.width());
   EXPECT_EQ(required_size.height(), text_bounds.height());
   EXPECT_EQ(gfx::Canvas::FORCE_LTR_DIRECTIONALITY, flags);
 
   // Left aligned text with border.
-  label.SetHorizontalAlignment(Label::ALIGN_LEFT);
+  label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
   paint_text.clear();
   text_bounds.SetRect(0, 0, 0, 0);
   label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
   EXPECT_EQ(test_text, paint_text);
   // The text should be left aligned horizontally and centered vertically.
   EXPECT_EQ(border.left(), text_bounds.x());
   EXPECT_EQ(border.top() + extra.height() / 2 , text_bounds.y());
   EXPECT_EQ(required_size.width(), text_bounds.width());
   EXPECT_EQ(required_size.height(), text_bounds.height());
   EXPECT_EQ(gfx::Canvas::FORCE_LTR_DIRECTIONALITY, flags);
 
   // Right aligned text.
-  label.SetHorizontalAlignment(Label::ALIGN_RIGHT);
+  label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
   paint_text.clear();
   text_bounds.SetRect(0, 0, 0, 0);
   label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
   EXPECT_EQ(test_text, paint_text);
   // The text should be right aligned horizontally and centered vertically.
   EXPECT_EQ(border.left() + extra.width(), text_bounds.x());
   EXPECT_EQ(border.top() + extra.height() / 2 , text_bounds.y());
   EXPECT_EQ(required_size.width(), text_bounds.width());
   EXPECT_EQ(required_size.height(), text_bounds.height());
   EXPECT_EQ(gfx::Canvas::FORCE_LTR_DIRECTIONALITY, flags);
@@ skipping 33 matching lines @@
   int expected_flags = gfx::Canvas::MULTI_LINE |
                        gfx::Canvas::TEXT_ALIGN_CENTER |
                        gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
 #if defined(OS_WIN)
   EXPECT_EQ(expected_flags, flags);
 #else
   EXPECT_EQ(expected_flags | gfx::Canvas::NO_ELLIPSIS, flags);
 #endif
   gfx::Rect center_bounds(text_bounds);
 
-  label.SetHorizontalAlignment(Label::ALIGN_LEFT);
+  label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
   paint_text.clear();
   text_bounds.SetRect(0, 0, 0, 0);
   label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
   EXPECT_EQ(test_text, paint_text);
   EXPECT_EQ(0, text_bounds.x());
   EXPECT_EQ(extra.height() / 2, text_bounds.y());
   EXPECT_GT(text_bounds.width(), kMinTextDimension);
   EXPECT_GT(text_bounds.height(), kMinTextDimension);
   expected_flags = gfx::Canvas::MULTI_LINE |
                    gfx::Canvas::TEXT_ALIGN_LEFT |
                    gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
 #if defined(OS_WIN)
   EXPECT_EQ(expected_flags, flags);
 #else
   EXPECT_EQ(expected_flags | gfx::Canvas::NO_ELLIPSIS, flags);
 #endif
 
-  label.SetHorizontalAlignment(Label::ALIGN_RIGHT);
+  label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
   paint_text.clear();
   text_bounds.SetRect(0, 0, 0, 0);
   label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
   EXPECT_EQ(test_text, paint_text);
   EXPECT_EQ(extra.width(), text_bounds.x());
   EXPECT_EQ(extra.height() / 2, text_bounds.y());
   EXPECT_GT(text_bounds.width(), kMinTextDimension);
   EXPECT_GT(text_bounds.height(), kMinTextDimension);
   expected_flags = gfx::Canvas::MULTI_LINE |
                    gfx::Canvas::TEXT_ALIGN_RIGHT |
                    gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
 #if defined(OS_WIN)
   EXPECT_EQ(expected_flags, flags);
 #else
   EXPECT_EQ(expected_flags | gfx::Canvas::NO_ELLIPSIS, flags);
 #endif
 
   // Test multiline drawing with a border.
   gfx::Insets border(19, 92, 23, 2);
   label.set_border(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(Label::ALIGN_CENTER);
+  label.SetHorizontalAlignment(gfx::ALIGN_CENTER);
   paint_text.clear();
   text_bounds.SetRect(0, 0, 0, 0);
   label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
   EXPECT_EQ(test_text, paint_text);
   EXPECT_EQ(border.left() + extra.width() / 2, text_bounds.x());
   EXPECT_EQ(border.top() + extra.height() / 2, text_bounds.y());
   EXPECT_EQ(center_bounds.width(), text_bounds.width());
   EXPECT_EQ(center_bounds.height(), text_bounds.height());
   expected_flags = gfx::Canvas::MULTI_LINE |
                    gfx::Canvas::TEXT_ALIGN_CENTER |
                    gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
 #if defined(OS_WIN)
   EXPECT_EQ(expected_flags, flags);
 #else
   EXPECT_EQ(expected_flags | gfx::Canvas::NO_ELLIPSIS, flags);
 #endif
 
-  label.SetHorizontalAlignment(Label::ALIGN_LEFT);
+  label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
   paint_text.clear();
   text_bounds.SetRect(0, 0, 0, 0);
   label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
   EXPECT_EQ(test_text, paint_text);
   EXPECT_EQ(border.left(), text_bounds.x());
   EXPECT_EQ(border.top() + extra.height() / 2, text_bounds.y());
   EXPECT_EQ(center_bounds.width(), text_bounds.width());
   EXPECT_EQ(center_bounds.height(), text_bounds.height());
   expected_flags = gfx::Canvas::MULTI_LINE |
                    gfx::Canvas::TEXT_ALIGN_LEFT |
                    gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
 #if defined(OS_WIN)
   EXPECT_EQ(expected_flags, flags);
 #else
   EXPECT_EQ(expected_flags | gfx::Canvas::NO_ELLIPSIS, flags);
 #endif
 
-  label.SetHorizontalAlignment(Label::ALIGN_RIGHT);
+  label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
   paint_text.clear();
   text_bounds.SetRect(0, 0, 0, 0);
   label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
   EXPECT_EQ(test_text, paint_text);
   EXPECT_EQ(extra.width() + border.left(), text_bounds.x());
   EXPECT_EQ(border.top() + extra.height() / 2, text_bounds.y());
   EXPECT_EQ(center_bounds.width(), text_bounds.width());
   EXPECT_EQ(center_bounds.height(), text_bounds.height());
   expected_flags = gfx::Canvas::MULTI_LINE |
                    gfx::Canvas::TEXT_ALIGN_RIGHT |
@@ skipping 30 matching lines @@
   label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
   EXPECT_EQ(test_text, paint_text);
   // The text should be centered horizontally and vertically.
   EXPECT_EQ(extra.width() / 2, text_bounds.x());
   EXPECT_EQ(extra.height() / 2 , text_bounds.y());
   EXPECT_EQ(required_size.width(), text_bounds.width());
   EXPECT_EQ(required_size.height(), text_bounds.height());
   EXPECT_EQ(0, flags);
 
   // ALIGN_LEFT label.
-  label.SetHorizontalAlignment(Label::ALIGN_LEFT);
+  label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
   paint_text.clear();
   text_bounds.SetRect(0, 0, 0, 0);
   label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
   EXPECT_EQ(test_text, paint_text);
   // The text should be right aligned horizontally and centered vertically.
   EXPECT_EQ(extra.width(), text_bounds.x());
   EXPECT_EQ(extra.height() / 2 , text_bounds.y());
   EXPECT_EQ(required_size.width(), text_bounds.width());
   EXPECT_EQ(required_size.height(), text_bounds.height());
   EXPECT_EQ(0, flags);
 
   // ALIGN_RIGHT label.
-  label.SetHorizontalAlignment(Label::ALIGN_RIGHT);
+  label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
   paint_text.clear();
   text_bounds.SetRect(0, 0, 0, 0);
   label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
   EXPECT_EQ(test_text, paint_text);
   // The text should be left aligned horizontally and centered vertically.
   EXPECT_EQ(0, text_bounds.x());
   EXPECT_EQ(extra.height() / 2 , text_bounds.y());
   EXPECT_EQ(required_size.width(), text_bounds.width());
   EXPECT_EQ(required_size.height(), text_bounds.height());
   EXPECT_EQ(0, flags);
@@ skipping 10 matching lines @@
   EXPECT_EQ(required_size.width() + border.width(),
             required_size_with_border.width());
   EXPECT_EQ(required_size.height() + border.height(),
             required_size_with_border.height());
   label.SetBounds(0,
                   0,
                   required_size_with_border.width() + extra.width(),
                   required_size_with_border.height() + extra.height());
 
   // Centered text with border.
-  label.SetHorizontalAlignment(Label::ALIGN_CENTER);
+  label.SetHorizontalAlignment(gfx::ALIGN_CENTER);
   paint_text.clear();
   text_bounds.SetRect(0, 0, 0, 0);
   label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
   EXPECT_EQ(test_text, paint_text);
   // The text should be centered horizontally and vertically within the border.
   EXPECT_EQ(border.left() + extra.width() / 2, text_bounds.x());
   EXPECT_EQ(border.top() + extra.height() / 2 , text_bounds.y());
   EXPECT_EQ(required_size.width(), text_bounds.width());
   EXPECT_EQ(required_size.height(), text_bounds.height());
   EXPECT_EQ(0, flags);
 
   // ALIGN_LEFT text with border.
-  label.SetHorizontalAlignment(Label::ALIGN_LEFT);
+  label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
   paint_text.clear();
   text_bounds.SetRect(0, 0, 0, 0);
   label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
   EXPECT_EQ(test_text, paint_text);
   // The text should be right aligned horizontally and centered vertically.
   EXPECT_EQ(border.left() + extra.width(), text_bounds.x());
   EXPECT_EQ(border.top() + extra.height() / 2 , text_bounds.y());
   EXPECT_EQ(required_size.width(), text_bounds.width());
   EXPECT_EQ(required_size.height(), text_bounds.height());
   EXPECT_EQ(0, flags);
 
   // ALIGN_RIGHT text.
-  label.SetHorizontalAlignment(Label::ALIGN_RIGHT);
+  label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
   paint_text.clear();
   text_bounds.SetRect(0, 0, 0, 0);
   label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
   EXPECT_EQ(test_text, paint_text);
   // The text should be left aligned horizontally and centered vertically.
   EXPECT_EQ(border.left(), text_bounds.x());
   EXPECT_EQ(border.top() + extra.height() / 2 , text_bounds.y());
   EXPECT_EQ(required_size.width(), text_bounds.width());
   EXPECT_EQ(required_size.height(), text_bounds.height());
   EXPECT_EQ(0, flags);
@@ skipping 37 matching lines @@
   EXPECT_EQ(gfx::Canvas::MULTI_LINE | gfx::Canvas::TEXT_ALIGN_CENTER, flags);
 #else
   EXPECT_EQ(
       gfx::Canvas::MULTI_LINE |
       gfx::Canvas::TEXT_ALIGN_CENTER |
       gfx::Canvas::NO_ELLIPSIS,
       flags);
 #endif
   gfx::Rect center_bounds(text_bounds);
 
-  label.SetHorizontalAlignment(Label::ALIGN_LEFT);
+  label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
   paint_text.clear();
   text_bounds.SetRect(0, 0, 0, 0);
   label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
   EXPECT_EQ(test_text, paint_text);
   EXPECT_EQ(extra.width(), text_bounds.x());
   EXPECT_EQ(extra.height() / 2, text_bounds.y());
   EXPECT_GT(text_bounds.width(), kMinTextDimension);
   EXPECT_GT(text_bounds.height(), kMinTextDimension);
 #if defined(OS_WIN)
   EXPECT_EQ(gfx::Canvas::MULTI_LINE | gfx::Canvas::TEXT_ALIGN_RIGHT, flags);
 #else
   EXPECT_EQ(
       gfx::Canvas::MULTI_LINE |
       gfx::Canvas::TEXT_ALIGN_RIGHT |
       gfx::Canvas::NO_ELLIPSIS,
       flags);
 #endif
 
-  label.SetHorizontalAlignment(Label::ALIGN_RIGHT);
+  label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
   paint_text.clear();
   text_bounds.SetRect(0, 0, 0, 0);
   label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
   EXPECT_EQ(test_text, paint_text);
   EXPECT_EQ(0, text_bounds.x());
   EXPECT_EQ(extra.height() / 2, text_bounds.y());
   EXPECT_GT(text_bounds.width(), kMinTextDimension);
   EXPECT_GT(text_bounds.height(), kMinTextDimension);
 #if defined(OS_WIN)
   EXPECT_EQ(gfx::Canvas::MULTI_LINE | gfx::Canvas::TEXT_ALIGN_LEFT, flags);
@@ skipping 10 matching lines @@
   label.set_border(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(Label::ALIGN_CENTER);
+  label.SetHorizontalAlignment(gfx::ALIGN_CENTER);
   paint_text.clear();
   text_bounds.SetRect(0, 0, 0, 0);
   label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
   EXPECT_EQ(test_text, paint_text);
   EXPECT_EQ(border.left() + extra.width() / 2, text_bounds.x());
   EXPECT_EQ(border.top() + extra.height() / 2, text_bounds.y());
   EXPECT_EQ(center_bounds.width(), text_bounds.width());
   EXPECT_EQ(center_bounds.height(), text_bounds.height());
 #if defined(OS_WIN)
   EXPECT_EQ(gfx::Canvas::MULTI_LINE | gfx::Canvas::TEXT_ALIGN_CENTER, flags);
 #else
   EXPECT_EQ(
       gfx::Canvas::MULTI_LINE |
       gfx::Canvas::TEXT_ALIGN_CENTER |
       gfx::Canvas::NO_ELLIPSIS,
       flags);
 #endif
 
-  label.SetHorizontalAlignment(Label::ALIGN_LEFT);
+  label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
   paint_text.clear();
   text_bounds.SetRect(0, 0, 0, 0);
   label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
   EXPECT_EQ(test_text, paint_text);
   EXPECT_EQ(border.left() + extra.width(), text_bounds.x());
   EXPECT_EQ(border.top() + extra.height() / 2, text_bounds.y());
   EXPECT_EQ(center_bounds.width(), text_bounds.width());
   EXPECT_EQ(center_bounds.height(), text_bounds.height());
 #if defined(OS_WIN)
   EXPECT_EQ(gfx::Canvas::MULTI_LINE | gfx::Canvas::TEXT_ALIGN_RIGHT, flags);
 #else
   EXPECT_EQ(
       gfx::Canvas::MULTI_LINE |
       gfx::Canvas::TEXT_ALIGN_RIGHT |
       gfx::Canvas::NO_ELLIPSIS,
       flags);
 #endif
 
-  label.SetHorizontalAlignment(Label::ALIGN_RIGHT);
+  label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
   paint_text.clear();
   text_bounds.SetRect(0, 0, 0, 0);
   label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
   EXPECT_EQ(test_text, paint_text);
   EXPECT_EQ(border.left(), text_bounds.x());
   EXPECT_EQ(border.top() + extra.height() / 2, text_bounds.y());
   EXPECT_EQ(center_bounds.width(), text_bounds.width());
   EXPECT_EQ(center_bounds.height(), text_bounds.height());
 #if defined(OS_WIN)
   EXPECT_EQ(gfx::Canvas::MULTI_LINE | gfx::Canvas::TEXT_ALIGN_LEFT, flags);
@@ skipping 17 matching lines @@
   EXPECT_EQ(
       0, label.ComputeDrawStringFlags() & gfx::Canvas::NO_SUBPIXEL_RENDERING);
 
   label.SetBackgroundColor(SkColorSetARGB(64, 255, 255, 255));
   EXPECT_EQ(
       gfx::Canvas::NO_SUBPIXEL_RENDERING,
       label.ComputeDrawStringFlags() & gfx::Canvas::NO_SUBPIXEL_RENDERING);
 }
 
 }  // namespace views