Modified tab change to work with status tray change

chrome/browser/ui/views/accessibility/accessibility_event_router_views_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 <string>
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/accessibility/accessibility_extension_api.h"
@@ skipping 406 matching lines @@
   window->GetRootView()->NotifyAccessibilityEvent(
       ui::AX_EVENT_ALERT, true);
   base::MessageLoop::current()->RunUntilIdle();
 
   EXPECT_EQ(1, control_event_count_);
   EXPECT_EQ(kTypeWindow, last_control_type_);
 
   window->CloseNow();
 }
 
+TEST_F(AccessibilityEventRouterViewsTest, AccessibilityFocusableView) {
+  // Create a view with a child view.
+  views::View* parent = new views::View();
+  views::View* child = new views::View();
+  parent->AddChildView(child);
+
+  // Put the view in a window.
+  views::Widget* window = CreateWindowWithContents(parent);
+
+  // This view should be either the current view or the next accessibility
+  // focusable view.
+  views::View* accessible_view;
+
+  // Since the child view has no accessiblity focusable ancestors, this
+  // should still be the child view.
+  accessible_view =

[sky, 2014/07/25 21:12:31]

nit: inline assignment so I don't have to worry about whether accessible_view is
set before you use it.

+      AccessibilityEventRouterViews::FindFirstAccessibleAncestor(child);
+  EXPECT_EQ(accessible_view, child);
+
+  // Now make the parent view accessiblity focusable. Calling
+  // FindFirstAccessibleAncestor() again on child shoudl return the parent
+  // view.
+  parent->SetAccessibilityFocusable(true);
+  accessible_view =
+      AccessibilityEventRouterViews::FindFirstAccessibleAncestor(child);
+  EXPECT_EQ(accessible_view, parent);
+
+  window->CloseNow();
+}
+
 namespace {
 
 class SimpleMenuDelegate : public ui::SimpleMenuModel::Delegate {
  public:
   enum {
     IDC_MENU_ITEM_1,
     IDC_MENU_ITEM_2,
     IDC_MENU_INVISIBLE,
     IDC_MENU_ITEM_3,
   };
@@ skipping 69 matching lines @@
 
     AccessibilityEventRouterViews::RecursiveGetMenuItemIndexAndCount(
         menu_container,
         menu->GetMenuItemByID(kTestCases[i].command_id),
         &index,
         &count);
     EXPECT_EQ(kTestCases[i].expected_index, index) << "Case " << i;
     EXPECT_EQ(kTestCases[i].expected_count, count) << "Case " << i;
   }
 }