diff options
| author | yusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-10 02:51:07 +0000 |
|---|---|---|
| committer | yusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-10 02:51:07 +0000 |
| commit | ff1de07210b17f20f93645692d889f2c283474ce (patch) | |
| tree | 27952205cc8d6342b36f93ca884af15a9f66647a /ash/accelerators | |
| parent | edd65213ae72df8720d04489df6df75d6c2338b9 (diff) | |
| download | chromium_src-ff1de07210b17f20f93645692d889f2c283474ce.zip chromium_src-ff1de07210b17f20f93645692d889f2c283474ce.tar.gz chromium_src-ff1de07210b17f20f93645692d889f2c283474ce.tar.bz2 | |
cleanup: Simplify ash/accelerators/accelerator_controller_unittest.cc.
Since we have fixed crbug.com/110572, we no longer have to use a dummy window in the tests.
BUG=None
TEST=ran aura_shell_unittests
Review URL: http://codereview.chromium.org/9375009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121385 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators')
| -rw-r--r-- | ash/accelerators/accelerator_controller_unittest.cc | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc index 78d731b..c494701 100644 --- a/ash/accelerators/accelerator_controller_unittest.cc +++ b/ash/accelerators/accelerator_controller_unittest.cc @@ -295,18 +295,6 @@ TEST_F(AcceleratorControllerTest, Process) { #if defined(OS_WIN) || defined(USE_X11) TEST_F(AcceleratorControllerTest, ProcessOnce) { - // A focused window must exist for accelerators to be processed. - aura::Window* default_container = - ash::Shell::GetInstance()->GetContainer( - internal::kShellWindowId_DefaultContainer); - aura::test::TestWindowDelegate test_delegate; - scoped_ptr<aura::Window> window(aura::test::CreateTestWindowWithDelegate( - &test_delegate, - -1, - gfx::Rect(), - default_container)); - ActivateWindow(window.get()); - const ui::Accelerator accelerator_a(ui::VKEY_A, false, false, false); TestTarget target; GetController()->Register(accelerator_a, &target); @@ -344,25 +332,10 @@ TEST_F(AcceleratorControllerTest, ProcessOnce) { EXPECT_FALSE(aura::RootWindow::GetInstance()->DispatchKeyEvent(&key_event3)); #endif EXPECT_EQ(1, target.accelerator_pressed_count()); - - // Reset window before |test_delegate| gets deleted. - window.reset(); } #endif TEST_F(AcceleratorControllerTest, GlobalAccelerators) { - // A focused window must exist for accelerators to be processed. - aura::Window* default_container = - ash::Shell::GetInstance()->GetContainer( - internal::kShellWindowId_DefaultContainer); - aura::test::TestWindowDelegate test_delegate; - scoped_ptr<aura::Window> window(aura::test::CreateTestWindowWithDelegate( - &test_delegate, - -1, - gfx::Rect(), - default_container)); - ActivateWindow(window.get()); - // CycleBackward EXPECT_TRUE(GetController()->Process( ui::Accelerator(ui::VKEY_F5, true, false, false))); @@ -553,9 +526,6 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) { EXPECT_TRUE(GetController()->Process( ui::Accelerator(ui::VKEY_L, true, true, false))); #endif - - // Reset window before |test_delegate| gets deleted. - window.reset(); } } // namespace test |