Add views::Button style enum for LabelButton [native] styling, etc.

ui/views/controls/button/label_button_unittest.cc

Index: ui/views/controls/button/label_button_unittest.cc
diff --git a/ui/views/controls/button/label_button_unittest.cc b/ui/views/controls/button/label_button_unittest.cc
index 5d110f1c577866c189479f24cf6ccf4440e04283..95ae6ab31d427263e2a9f70259eb5b23e3d6ac90 100644
--- a/ui/views/controls/button/label_button_unittest.cc
+++ b/ui/views/controls/button/label_button_unittest.cc
@@ -29,16 +29,16 @@ TEST_F(LabelButtonTest, Init) {
   const string16 text(ASCIIToUTF16("abc"));
   LabelButton button(NULL, text);
 
-  EXPECT_TRUE(button.GetImage(CustomButton::STATE_NORMAL).isNull());
-  EXPECT_TRUE(button.GetImage(CustomButton::STATE_HOVERED).isNull());
-  EXPECT_TRUE(button.GetImage(CustomButton::STATE_PRESSED).isNull());
-  EXPECT_TRUE(button.GetImage(CustomButton::STATE_DISABLED).isNull());
+  EXPECT_TRUE(button.GetImage(Button::STATE_NORMAL).isNull());
+  EXPECT_TRUE(button.GetImage(Button::STATE_HOVERED).isNull());
+  EXPECT_TRUE(button.GetImage(Button::STATE_PRESSED).isNull());
+  EXPECT_TRUE(button.GetImage(Button::STATE_DISABLED).isNull());
 
   EXPECT_EQ(text, button.GetText());
   EXPECT_EQ(gfx::ALIGN_LEFT, button.GetHorizontalAlignment());
   EXPECT_FALSE(button.default_button());
-  EXPECT_FALSE(button.native_theme());
-  EXPECT_EQ(CustomButton::STATE_NORMAL, button.state());
+  EXPECT_EQ(button.style(), Button::STYLE_TEXTBUTTON);
+  EXPECT_EQ(Button::STATE_NORMAL, button.state());
 
   EXPECT_EQ(button.image_->parent(), &button);
   EXPECT_EQ(button.label_->parent(), &button);
@@ -85,15 +85,15 @@ TEST_F(LabelButtonTest, Image) {
   // The width increases monotonically with image size (it does not shrink).
   EXPECT_LT(button.GetPreferredSize().width(), small_size);
   EXPECT_LT(button.GetPreferredSize().height(), small_size);
-  button.SetImage(CustomButton::STATE_NORMAL, small_image);
+  button.SetImage(Button::STATE_NORMAL, small_image);
   EXPECT_GT(button.GetPreferredSize().width(), small_size);
   EXPECT_GT(button.GetPreferredSize().height(), small_size);
   EXPECT_LT(button.GetPreferredSize().width(), large_size);
   EXPECT_LT(button.GetPreferredSize().height(), large_size);
-  button.SetImage(CustomButton::STATE_NORMAL, large_image);
+  button.SetImage(Button::STATE_NORMAL, large_image);
   EXPECT_GT(button.GetPreferredSize().width(), large_size);
   EXPECT_GT(button.GetPreferredSize().height(), large_size);
-  button.SetImage(CustomButton::STATE_NORMAL, small_image);
+  button.SetImage(Button::STATE_NORMAL, small_image);
   EXPECT_GT(button.GetPreferredSize().width(), large_size);
   EXPECT_GT(button.GetPreferredSize().height(), large_size);
 
@@ -127,7 +127,7 @@ TEST_F(LabelButtonTest, LabelAndImage) {
   EXPECT_GT(button.GetPreferredSize().height(), font.GetHeight());
   EXPECT_LT(button.GetPreferredSize().width(), text_width + image_size);
   EXPECT_LT(button.GetPreferredSize().height(), image_size);
-  button.SetImage(CustomButton::STATE_NORMAL, image);
+  button.SetImage(Button::STATE_NORMAL, image);
   EXPECT_GT(button.GetPreferredSize().width(), text_width + image_size);
   EXPECT_GT(button.GetPreferredSize().height(), image_size);
 
@@ -149,7 +149,7 @@ TEST_F(LabelButtonTest, LabelAndImage) {
   button.SetText(string16());
   EXPECT_GT(button.GetPreferredSize().width(), text_width + image_size);
   EXPECT_GT(button.GetPreferredSize().height(), image_size);
-  button.SetImage(CustomButton::STATE_NORMAL, gfx::ImageSkia());
+  button.SetImage(Button::STATE_NORMAL, gfx::ImageSkia());
   EXPECT_GT(button.GetPreferredSize().width(), text_width + image_size);
   EXPECT_GT(button.GetPreferredSize().height(), image_size);