Deletes keyboard container before recreating the controller.

ash/root_window_controller_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/root_window_controller.h"
 
 #include "ash/session_state_delegate.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
@@ skipping 576 matching lines @@
        block_reason < NUMBER_OF_BLOCK_REASONS;
        ++block_reason) {
     BlockUserSession(static_cast<UserSessionBlockReason>(block_reason));
     event_generator.ClickLeftButton();
     expected_mouse_presses++;
     EXPECT_EQ(expected_mouse_presses, main_delegate->mouse_presses());
     UnblockUserSession();
   }
 }
 
+// Test for http://crbug.com/299787. RootWindowController should delete
+// the old container since the keyboard controller creates a new window in
+// GetWindowContainer().
+TEST_F(VirtualKeyboardRootWindowControllerTest,
+       DeleteOldContainerOnVirtualKeyboardInit) {
+  aura::RootWindow* root_window = ash::Shell::GetPrimaryRootWindow();
+  aura::Window* keyboard_container = Shell::GetContainer(root_window,
+      internal::kShellWindowId_VirtualKeyboardContainer);
+  ASSERT_TRUE(keyboard_container);
+  // Track the keyboard container window.
+  aura::WindowTracker tracker;
+  tracker.Add(keyboard_container);
+  // Mock a login state change to reinitialize the keyboard.
+  ash::Shell::GetInstance()->OnLoginStateChanged(user::LOGGED_IN_OWNER);
+  // keyboard_container should no longer be present.
+  EXPECT_FALSE(tracker.Contains(keyboard_container));
+}
+
 }  // namespace test
 }  // namespace ash