Replace Label::Alignment with gfx::HorizontalAlignment

ui/views/controls/button/label_button_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/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/size.h"
 #include "ui/views/controls/button/label_button.h"
@@ skipping 17 matching lines @@
 TEST_F(LabelButtonTest, Init) {
   const string16 text(ASCIIToUTF16("abc"));
   LabelButton button(NULL, text);
 
   EXPECT_TRUE(button.GetImage(CustomButton::BS_NORMAL).isNull());
   EXPECT_TRUE(button.GetImage(CustomButton::BS_HOT).isNull());
   EXPECT_TRUE(button.GetImage(CustomButton::BS_PUSHED).isNull());
   EXPECT_TRUE(button.GetImage(CustomButton::BS_DISABLED).isNull());
 
   EXPECT_EQ(text, button.GetText());
-  EXPECT_EQ(Label::ALIGN_LEFT, button.GetHorizontalAlignment());
+  EXPECT_EQ(gfx::ALIGN_LEFT, button.GetHorizontalAlignment());
   EXPECT_FALSE(button.default_button());
   EXPECT_FALSE(button.native_theme());
   EXPECT_EQ(CustomButton::BS_NORMAL, button.state());
 
   EXPECT_EQ(button.image_->parent(), &button);
   EXPECT_EQ(button.label_->parent(), &button);
 }
 
 TEST_F(LabelButtonTest, Label) {
   LabelButton button(NULL, string16());
@@ skipping 79 matching lines @@
   EXPECT_LT(button.GetPreferredSize().width(), text_width + image_size);
   EXPECT_LT(button.GetPreferredSize().height(), image_size);
   button.SetImage(CustomButton::BS_NORMAL, image);
   EXPECT_GT(button.GetPreferredSize().width(), text_width + image_size);
   EXPECT_GT(button.GetPreferredSize().height(), image_size);
 
   // Layout and ensure the image is left of the label except for ALIGN_RIGHT.
   // (A proper parent view or layout manager would Layout on its invalidations).
   button.SetSize(button.GetPreferredSize());
   button.Layout();
-  EXPECT_EQ(Label::ALIGN_LEFT, button.GetHorizontalAlignment());
+  EXPECT_EQ(gfx::ALIGN_LEFT, button.GetHorizontalAlignment());
   EXPECT_LT(button.image_->bounds().right(), button.label_->bounds().x());
-  button.SetHorizontalAlignment(Label::ALIGN_CENTER);
+  button.SetHorizontalAlignment(gfx::ALIGN_CENTER);
   button.Layout();
-  EXPECT_EQ(Label::ALIGN_CENTER, button.GetHorizontalAlignment());
+  EXPECT_EQ(gfx::ALIGN_CENTER, button.GetHorizontalAlignment());
   EXPECT_LT(button.image_->bounds().right(), button.label_->bounds().x());
-  button.SetHorizontalAlignment(Label::ALIGN_RIGHT);
+  button.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
   button.Layout();
-  EXPECT_EQ(Label::ALIGN_RIGHT, button.GetHorizontalAlignment());
+  EXPECT_EQ(gfx::ALIGN_RIGHT, button.GetHorizontalAlignment());
   EXPECT_LT(button.label_->bounds().right(), button.image_->bounds().x());
 
   button.SetText(string16());
   EXPECT_GT(button.GetPreferredSize().width(), text_width + image_size);
   EXPECT_GT(button.GetPreferredSize().height(), image_size);
   button.SetImage(CustomButton::BS_NORMAL, gfx::ImageSkia());
   EXPECT_GT(button.GetPreferredSize().width(), text_width + image_size);
   EXPECT_GT(button.GetPreferredSize().height(), image_size);
 
   // Clamp the size to a maximum value.
@@ skipping 23 matching lines @@
 
   // The button returns to its original size when the minimal size is cleared
   // and the original font size is restored.
   button.set_min_size(gfx::Size());
   button.SetFont(original_font);
   EXPECT_EQ(original_width, button.GetPreferredSize().width());
   EXPECT_EQ(original_height, button.GetPreferredSize().height());
 }
 
 }  // namespace views