diff options
| author | kevers@chromium.org <kevers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-01 19:12:02 +0000 |
|---|---|---|
| committer | kevers@chromium.org <kevers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-01 19:12:02 +0000 |
| commit | 5e9110ebaff17248b6977084623a4fa9c0e7aa00 (patch) | |
| tree | 73b0b2bfaa53f8c2969eefd3f256823dc4bb53b1 | |
| parent | 99cb3101ca41e3a9e303020fdb7ee5398f2b7b4d (diff) | |
| download | chromium_src-5e9110ebaff17248b6977084623a4fa9c0e7aa00.zip chromium_src-5e9110ebaff17248b6977084623a4fa9c0e7aa00.tar.gz chromium_src-5e9110ebaff17248b6977084623a4fa9c0e7aa00.tar.bz2 | |
Fix keyboard unit test.
BUG=357848
Review URL: https://codereview.chromium.org/219443002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260915 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ui/keyboard/keyboard_controller_unittest.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ui/keyboard/keyboard_controller_unittest.cc b/ui/keyboard/keyboard_controller_unittest.cc index d735883..cee5581 100644 --- a/ui/keyboard/keyboard_controller_unittest.cc +++ b/ui/keyboard/keyboard_controller_unittest.cc @@ -399,12 +399,11 @@ TEST_F(KeyboardControllerTest, KeyboardResizingFromContents) { keyboard_container->SetBounds(gfx::Rect(800, 600)); keyboard_container->AddChild(keyboard_window); - // Default keyboard size. - EXPECT_EQ(180, keyboard_window->bounds().height()); + int original_height = keyboard_window->bounds().height(); // Resizes from contents when flag is unset. keyboard_window->SetBounds(gfx::Rect(100, 80)); - EXPECT_EQ(180, keyboard_window->bounds().height()); + EXPECT_EQ(original_height, keyboard_window->bounds().height()); // Resizes from contents when flag is set. proxy()->set_resizing_from_contents(true); @@ -418,7 +417,7 @@ TEST_F(KeyboardControllerTest, KeyboardResizingFromContents) { // Resizes from container when flag is unset. proxy()->set_resizing_from_contents(false); keyboard_container->SetBounds(gfx::Rect(800, 600)); - EXPECT_EQ(180, keyboard_window->bounds().height()); + EXPECT_EQ(original_height, keyboard_window->bounds().height()); } class KeyboardControllerAnimationTest : public KeyboardControllerTest, |