Restore window size after accessbility keyboard hides.

ash/wm/workspace/workspace_layout_manager_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 "ash/wm/workspace/workspace_layout_manager.h"
 
 #include <string>
 
 #include "ash/display/display_layout.h"
 #include "ash/display/display_manager.h"
@@ skipping 974 matching lines @@
         Shell::GetPrimaryRootWindow(), kShellWindowId_DefaultContainer);
     layout_manager_ = static_cast<WorkspaceLayoutManager*>(
         default_container->layout_manager());
   }
 
   aura::Window* CreateTestWindow(const gfx::Rect& bounds) {
     return CreateTestWindowInShellWithBounds(bounds);
   }
 
   void ShowKeyboard() {
+    layout_manager_->OnKeyboardBoundsChanging(keyboard_bounds_);
     restore_work_area_insets_ = Shell::GetScreen()->GetPrimaryDisplay().
         GetWorkAreaInsets();
     Shell::GetInstance()->SetDisplayWorkAreaInsets(
         Shell::GetPrimaryRootWindow(),
         gfx::Insets(0, 0, keyboard_bounds_.height(), 0));
-    layout_manager_->OnKeyboardBoundsChanging(keyboard_bounds_);
   }
 
   void HideKeyboard() {
     Shell::GetInstance()->SetDisplayWorkAreaInsets(
         Shell::GetPrimaryRootWindow(),
         restore_work_area_insets_);
     layout_manager_->OnKeyboardBoundsChanging(gfx::Rect());
   }
 
   void SetKeyboardBounds(const gfx::Rect& bounds) {
@@ skipping 25 matching lines @@
 
 TEST_F(WorkspaceLayoutManagerKeyboardTest, AdjustWindowForA11yKeyboard) {
   gfx::Rect work_area(
       Shell::GetScreen()->GetPrimaryDisplay().work_area());
   gfx::Rect keyboard_bounds(work_area.x(),
                             work_area.y() + work_area.height() / 2,
                             work_area.width(),
                             work_area.height() / 2);
 
   SetKeyboardBounds(keyboard_bounds);
-  scoped_ptr<aura::Window> window(
-      CreateTestWindowInShellWithBounds(work_area));
+
+  aura::test::TestWindowDelegate delegate;
+  scoped_ptr<aura::Window> window(CreateTestWindowInShellWithDelegate(
+      &delegate, -1, work_area));
 
   aura::Window* root_window = ash::Shell::GetInstance()->GetPrimaryRootWindow();
   FakeTextInputClient text_input_client(window.get());
   ui::InputMethod* input_method =
       root_window->GetProperty(aura::client::kRootWindowInputMethodKey);
   if (switches::IsTextInputFocusManagerEnabled()) {
     ui::TextInputFocusManager::GetInstance()->FocusTextInputClient(
         &text_input_client);
   } else {
     input_method->SetFocusedTextInputClient(&text_input_client);
   }
 
   int available_height =
       Shell::GetScreen()->GetPrimaryDisplay().bounds().height() -
       keyboard_bounds.height();
 
-  EXPECT_EQ(gfx::Rect(work_area).ToString(),
-      window->bounds().ToString());
+  EXPECT_EQ(gfx::Rect(work_area).ToString(), window->bounds().ToString());
   ShowKeyboard();
   EXPECT_EQ(gfx::Rect(work_area.origin(),
             gfx::Size(work_area.width(), available_height)).ToString(),
             window->bounds().ToString());
   HideKeyboard();
+  EXPECT_EQ(gfx::Rect(work_area).ToString(), window->bounds().ToString());
 
-  window->SetBounds(gfx::Rect(50, 50, 100, 500));
-  EXPECT_EQ("50,50 100x500", window->bounds().ToString());
+  gfx::Rect small_window_bound(50, 50, 100, 500);
+  window->SetBounds(small_window_bound);
+  EXPECT_EQ(small_window_bound.ToString(), window->bounds().ToString());
   ShowKeyboard();
   EXPECT_EQ(gfx::Rect(50, 0, 100, available_height).ToString(),
             window->bounds().ToString());
   HideKeyboard();
+  EXPECT_EQ(small_window_bound.ToString(), window->bounds().ToString());
+
   if (switches::IsTextInputFocusManagerEnabled()) {
     ui::TextInputFocusManager::GetInstance()->BlurTextInputClient(
         &text_input_client);
   } else {
     input_method->SetFocusedTextInputClient(NULL);
   }
 }
 
 }  // namespace ash