Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ash / display / virtual_keyboard_window_controller_unittest.cc

diff --git a/src/ash/display/virtual_keyboard_window_controller_unittest.cc b/src/ash/display/virtual_keyboard_window_controller_unittest.cc
index 915be43..fdb01f0 100644 (file)
--- a/src/ash/display/virtual_keyboard_window_controller_unittest.cc
+++ b/src/ash/display/virtual_keyboard_window_controller_unittest.cc
@@ -24,18 +24,17 @@ class VirtualKeyboardWindowControllerTest : public AshTestBase {
   virtual ~VirtualKeyboardWindowControllerTest() {}
 
   void set_virtual_keyboard_window_controller(
-      internal::VirtualKeyboardWindowController* controller) {
+      VirtualKeyboardWindowController* controller) {
     virtual_keyboard_window_controller_ = controller;
   }
 
-  internal::RootWindowController* root_window_controller() {
+  RootWindowController* root_window_controller() {
     return virtual_keyboard_window_controller_->
         root_window_controller_for_test();
   }
 
  private:
-  internal::VirtualKeyboardWindowController*
-      virtual_keyboard_window_controller_;
+  VirtualKeyboardWindowController* virtual_keyboard_window_controller_;
   DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardWindowControllerTest);
 };
 
@@ -68,9 +67,13 @@ TEST_F(VirtualKeyboardUsabilityExperimentTest, VirtualKeyboardWindowTest) {
       Shell::GetInstance()->display_controller()->
           virtual_keyboard_window_controller());
   EXPECT_TRUE(root_window_controller());
-  // Keyboard container is added to virtual keyboard window.
-  EXPECT_TRUE(root_window_controller()->GetContainer(
-      internal::kShellWindowId_VirtualKeyboardContainer));
+  aura::Window* container = root_window_controller()->GetContainer(
+      kShellWindowId_VirtualKeyboardContainer);
+  // Keyboard container is added to virtual keyboard window and its bounds is
+  // the same as root window.
+  EXPECT_TRUE(container);
+  EXPECT_EQ(container->bounds(),
+            root_window_controller()->GetRootWindow()->bounds());
 }
 
 // Tests that the onscreen keyboard becomes enabled when maximize mode is