LabelButton: SetAccessibleName on SetText; update test.

chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc

Index: chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc
diff --git a/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc b/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc
index 051bfa724dca7837a5542c59ad1acbeee0d02741..f49602615b6986a0f1e760d15477764fb559efc3 100644
--- a/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc
+++ b/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc
@@ -15,7 +15,7 @@
 #include "content/public/browser/notification_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/accessibility/accessible_view_state.h"
-#include "ui/views/controls/button/text_button.h"
+#include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/test/test_views_delegate.h"
@@ -167,14 +167,17 @@ TEST_F(AccessibilityEventRouterViewsTest, TestFocusNotification) {
 
   // Create a contents view with 3 buttons.
   views::View* contents = new views::View();
-  views::NativeTextButton* button1 = new views::NativeTextButton(
+  views::LabelButton* button1 = new views::LabelButton(
       NULL, ASCIIToUTF16(kButton1ASCII));
+  button1->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
   contents->AddChildView(button1);
-  views::NativeTextButton* button2 = new views::NativeTextButton(
+  views::LabelButton* button2 = new views::LabelButton(
       NULL, ASCIIToUTF16(kButton2ASCII));
+  button2->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
   contents->AddChildView(button2);
-  views::NativeTextButton* button3 = new views::NativeTextButton(
+  views::LabelButton* button3 = new views::LabelButton(
       NULL, ASCIIToUTF16(kButton3ASCII));
+  button3->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
   contents->AddChildView(button3);
 
   // Put the view in a window.
@@ -232,8 +235,9 @@ TEST_F(AccessibilityEventRouterViewsTest, TestToolbarContext) {
   views::View* contents = new ViewWithNameAndRole(
       ASCIIToUTF16(kToolbarNameASCII),
       ui::AccessibilityTypes::ROLE_TOOLBAR);
-  views::NativeTextButton* button = new views::NativeTextButton(
+  views::LabelButton* button = new views::LabelButton(
       NULL, ASCIIToUTF16(kButtonNameASCII));
+  button->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
   contents->AddChildView(button);
 
   // Put the view in a window.
@@ -276,8 +280,9 @@ TEST_F(AccessibilityEventRouterViewsTest, TestAlertContext) {
       ui::AccessibilityTypes::ROLE_ALERT);
   views::Label* label = new views::Label(ASCIIToUTF16(kAlertTextASCII));
   contents->AddChildView(label);
-  views::NativeTextButton* button = new views::NativeTextButton(
+  views::LabelButton* button = new views::LabelButton(
       NULL, ASCIIToUTF16(kButtonNameASCII));
+  button->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
   contents->AddChildView(button);
 
   // Put the view in a window.