Revert 54074 - Add initial tests for keyboard access (tabbing in some dialogs).

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3015026

TBR=dtseng@chromium.org
Review URL: http://codereview.chromium.org/3046031

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54093 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 0 insertions, 183 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
index 189723a..1182059 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
@@ -700,8 +700,6 @@ void AutocompleteEditViewWin::ClosePopup() {
 
 void AutocompleteEditViewWin::SetFocus() {
   ::SetFocus(m_hWnd);
-  parent_view_->
-      NotifyAccessibilityEvent(AccessibilityTypes::EVENT_FOCUS, false);
 }
 
 IAccessible* AutocompleteEditViewWin::GetIAccessible() {
diff --git a/chrome/browser/views/bookmark_bar_view_test.cc b/chrome/browser/views/bookmark_bar_view_test.cc
index 5c4c722..78128bb 100644
--- a/chrome/browser/views/bookmark_bar_view_test.cc
+++ b/chrome/browser/views/bookmark_bar_view_test.cc
@@ -70,9 +70,6 @@ class ViewsDelegateImpl : public views::ViewsDelegate {
     return false;
   }
 
-  virtual void NotifyAccessibilityEvent(
-      views::View* view, AccessibilityTypes::Event event_type) {}
-
 #if defined(OS_WIN)
   virtual HICON GetDefaultWindowIcon() const { return 0; }
 #endif
diff --git a/chrome/browser/views/browser_keyboard_accessibility_test_win.cc b/chrome/browser/views/browser_keyboard_accessibility_test_win.cc
deleted file mode 100644
index c1ad34d..0000000
--- a/chrome/browser/views/browser_keyboard_accessibility_test_win.cc
+++ /dev/null
@@ -1,175 +0,0 @@
-// Copyright (c) 2010 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/keyboard_codes.h"
-#include "chrome/browser/automation/ui_controls.h"
-#include "chrome/browser/views/chrome_views_delegate.h"
-#include "chrome/browser/views/frame/browser_view.h"
-#include "chrome/test/in_process_browser_test.h"
-#include "chrome/test/ui_test_utils.h"
-#include "views/view.h"
-#include "views/accessibility/view_accessibility.h"
-#include "views/widget/widget.h"
-#include "views/window/window.h"
-
-namespace {
-
-class BrowserKeyboardAccessibility : public InProcessBrowserTest,
-                                     public ChromeViewsDelegate {
- public:
-  BrowserKeyboardAccessibility()
-      : is_waiting_(false),
-        current_view_(NULL) {
-    // Set ourselves as the currently active ViewsDelegate.
-    ViewsDelegate::views_delegate = this;
-  }
-
-  ~BrowserKeyboardAccessibility() {}
-
-  // Overidden from ChromeViewsDelegate.
-  // Save the last notification sent by views::View::NotifyAccessibilityEvent.
-  virtual void NotifyAccessibilityEvent(
-      views::View* view, AccessibilityTypes::Event event_type) {
-    current_view_  = view;
-    current_event_type_ = event_type;
-
-    // Are we within a message loop waiting for a particular event?
-    if (is_waiting_) {
-      is_waiting_ = false;
-      MessageLoop::current()->Quit();
-    }
-  }
-
-  // Helper that performs tabbing until it cycles back to the original focus.
-  void TabCyclerForwardAndBack(gfx::NativeWindow hwnd);
-  void TabCycler(gfx::NativeWindow hwnd, bool forward_tab);
-
-  views::View* current_view() const { return current_view_; }
-
-  gfx::NativeWindow current_view_native_window() const {
-    return current_view()->GetWidget()->GetNativeView();
-  }
-
-  AccessibilityTypes::Event current_event() const {
-    return current_event_type_;
-  }
-
-  void set_waiting(bool value) { is_waiting_ = value; }
-
- private:
-  // Are we waiting for an event?
-  bool is_waiting_;
-
-  // View of interest (i.e. for testing or one we are waiting to gain focus).
-  views::View* current_view_;
-
-  // Event type of interest.
-  AccessibilityTypes::Event current_event_type_;
-};
-
-IN_PROC_BROWSER_TEST_F(BrowserKeyboardAccessibility, TabInAboutChromeDialog) {
-  views::Window* about_chrome_window =
-      BrowserView::GetBrowserViewForNativeWindow(
-          browser()->window()->GetNativeHandle())->ShowAboutChromeDialog();
-
-  TabCyclerForwardAndBack(about_chrome_window->GetNativeWindow());
-}
-
-IN_PROC_BROWSER_TEST_F(BrowserKeyboardAccessibility,
-                       TabInClearBrowsingDataDialog) {
-  browser()->OpenClearBrowsingDataDialog();
-  TabCyclerForwardAndBack(current_view_native_window());
-}
-
-IN_PROC_BROWSER_TEST_F(BrowserKeyboardAccessibility,
-                       TabInImportSettingsDialog) {
-  browser()->OpenImportSettingsDialog();
-  TabCyclerForwardAndBack(current_view_native_window());
-}
-
-IN_PROC_BROWSER_TEST_F(BrowserKeyboardAccessibility, TabInKeywordEditor) {
-  browser()->OpenKeywordEditor();
-  TabCyclerForwardAndBack(current_view_native_window());
-}
-
-IN_PROC_BROWSER_TEST_F(BrowserKeyboardAccessibility, TabInOptionsDialog) {
-  browser()->OpenOptionsDialog();
-
-  // Tab through each of the three tabs.
-  for (int i = 0; i < 3; ++i) {
-    TabCyclerForwardAndBack(current_view_native_window());
-    ui_controls::SendKeyPressNotifyWhenDone(current_view_native_window(),
-                                            base::VKEY_TAB,
-                                            true, false, false, false,
-                                            new MessageLoop::QuitTask());
-    set_waiting(true);
-    ui_test_utils::RunMessageLoop();
-  }
-}
-
-IN_PROC_BROWSER_TEST_F(BrowserKeyboardAccessibility, TabInPasswordManager) {
-  browser()->OpenPasswordManager();
-  TabCyclerForwardAndBack(current_view_native_window());
-}
-
-// TODO(dtseng): http://www.crbug.com/50402
-IN_PROC_BROWSER_TEST_F(BrowserKeyboardAccessibility,
-                       FAILS_TabInSyncMyBookmarksDialog) {
-  browser()->OpenSyncMyBookmarksDialog();
-  TabCyclerForwardAndBack(current_view_native_window());
-}
-
-IN_PROC_BROWSER_TEST_F(BrowserKeyboardAccessibility, TabInTaskManager) {
-  browser()->OpenTaskManager();
-  TabCyclerForwardAndBack(current_view_native_window());
-}
-
-IN_PROC_BROWSER_TEST_F(BrowserKeyboardAccessibility, TabInToolbar) {
-  gfx::NativeWindow native_window = browser()->window()->GetNativeHandle();
-  ui_controls::SendKeyPressNotifyWhenDone(native_window,
-                                          base::VKEY_T,
-                                          false, true, true, false,
-                                          new MessageLoop::QuitTask());
-  set_waiting(true);
-  ui_test_utils::RunMessageLoop();
-  TabCyclerForwardAndBack(current_view_native_window());
-}
-
-IN_PROC_BROWSER_TEST_F(BrowserKeyboardAccessibility, TabInUpdateChromeDialog) {
-  browser()->OpenUpdateChromeDialog();
-  TabCyclerForwardAndBack(current_view_native_window());
-}
-
-void BrowserKeyboardAccessibility::TabCyclerForwardAndBack(
-    gfx::NativeWindow hwnd) {
-  TabCycler(hwnd, true);
-  TabCycler(hwnd, false);
-}
-
-void BrowserKeyboardAccessibility::TabCycler(gfx::NativeWindow hwnd,
-                                             bool forward_tab) {
-  // Wait for a focus event on the provided native window.
-  while (current_event() != AccessibilityTypes::EVENT_FOCUS ||
-         current_view_native_window() != hwnd) {
-    set_waiting(true);
-    ui_test_utils::RunMessageLoop();
-  }
-
-  views::View* first_focused_item = current_view();
-
-  ASSERT_TRUE(first_focused_item != NULL);
-
-  views::View* next_focused_item = first_focused_item;
-
-  // Keep tabbing until we reach the originally focused view.
-  do {
-    ui_controls::SendKeyPressNotifyWhenDone(hwnd, base::VKEY_TAB,
-        false, !forward_tab, false, false, new MessageLoop::QuitTask());
-    set_waiting(true);
-    ui_test_utils::RunMessageLoop();
-    next_focused_item = current_view();
-  } while (first_focused_item != next_focused_item);
-}
-
-}  // namespace
diff --git a/chrome/browser/views/chrome_views_delegate.h b/chrome/browser/views/chrome_views_delegate.h
index 4934a24..51ced5f 100644
--- a/chrome/browser/views/chrome_views_delegate.h
+++ b/chrome/browser/views/chrome_views_delegate.h
@@ -23,8 +23,6 @@ class ChromeViewsDelegate : public views::ViewsDelegate {
                                     gfx::Rect* bounds) const;
   virtual bool GetSavedMaximizedState(const std::wstring& window_name,
                                       bool* maximized) const;
-  virtual void NotifyAccessibilityEvent(
-    views::View* view, AccessibilityTypes::Event event_type) {}
 #if defined(OS_WIN)
   virtual HICON GetDefaultWindowIcon() const;
 #endif
diff --git a/chrome/test/interactive_ui/interactive_ui_tests.gypi b/chrome/test/interactive_ui/interactive_ui_tests.gypi
index 72c60c7..33529d5 100644
--- a/chrome/test/interactive_ui/interactive_ui_tests.gypi
+++ b/chrome/test/interactive_ui/interactive_ui_tests.gypi
@@ -36,7 +36,6 @@
     '<(DEPTH)/chrome/browser/gtk/bookmark_bar_gtk_interactive_uitest.cc',
     '<(DEPTH)/chrome/browser/notifications/notifications_interactive_uitest.cc',
     '<(DEPTH)/chrome/browser/views/bookmark_bar_view_test.cc',
-    '<(DEPTH)/chrome/browser/views/browser_keyboard_accessibility_test_win.cc',
     '<(DEPTH)/chrome/browser/views/find_bar_host_interactive_uitest.cc',
     '<(DEPTH)/chrome/browser/views/tabs/tab_dragging_test.cc',
     '<(DEPTH)/chrome/test/in_process_browser_test.cc',