Merge 157914 - Fix toolbar keyboard accessibility on Views (alternative impl).

ui/views/accessible_pane_view_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 "ui/views/accessible_pane_view.h"
 
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/test/views_test_base.h"
@@ skipping 12 matching lines @@
   TestBarView();
   virtual ~TestBarView();
 
   virtual void ButtonPressed(Button* sender,
                              const ui::Event& event) OVERRIDE;
   TextButton* child_button() const { return child_button_.get(); }
   TextButton* second_child_button() const { return second_child_button_.get(); }
   TextButton* third_child_button() const { return third_child_button_.get(); }
   TextButton* not_child_button() const { return not_child_button_.get(); }
 
-  const ui::Accelerator& home_key() const { return home_key_; }
-  const ui::Accelerator& end_key() const { return end_key_; }
-  const ui::Accelerator& escape_key() const { return escape_key_; }
-  const ui::Accelerator& left_key() const { return left_key_; }
-  const ui::Accelerator& right_key() const { return right_key_; }
-
   virtual View* GetDefaultFocusableChild() OVERRIDE;
 
  private:
   void Init();
 
   scoped_ptr<TextButton> child_button_;
   scoped_ptr<TextButton> second_child_button_;
   scoped_ptr<TextButton> third_child_button_;
   scoped_ptr<TextButton> not_child_button_;
 
@@ skipping 123 matching lines @@
             test_view->GetWidget()->GetFocusManager()->GetFocusedView());
 
   // ESC
   test_view->AcceleratorPressed(test_view->escape_key());
   EXPECT_EQ(original_test_view->third_child_button(),
             test_view->GetWidget()->GetFocusManager()->GetFocusedView());
   widget->CloseNow();
   widget.reset();
 }
 }  // namespace views