keyboard: Add a test suite for the tests, and initialize all the UI things properly.

ui/keyboard/keyboard_controller_unittest.cc

 // Copyright (c) 2013 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 "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/aura_test_helper.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/base/ime/input_method.h"
-#include "ui/base/ime/mock_input_method.h"
+#include "ui/base/ime/input_method_factory.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/compositor/layer_type.h"
 #include "ui/gfx/rect.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_controller_proxy.h"
 
 namespace keyboard {
 namespace {
 
 // An event handler that focuses a window when it is clicked/touched on. This is
@@ skipping 24 matching lines @@
 };
 
 class KeyboardControllerTest : public testing::Test {
  public:
   KeyboardControllerTest() {}
   virtual ~KeyboardControllerTest() {}
 
   virtual void SetUp() OVERRIDE {
     aura_test_helper_.reset(new aura::test::AuraTestHelper(&message_loop_));
     aura_test_helper_->SetUp();
+    ui::SetUpInputMethodFactoryForTesting();
     focus_controller_.reset(new TestFocusController(root_window()));
   }
 
   virtual void TearDown() OVERRIDE {
     aura_test_helper_->TearDown();
   }
 
   aura::RootWindow* root_window() { return aura_test_helper_->root_window(); }
 
  protected:
   base::MessageLoopForUI message_loop_;
   scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_;
   scoped_ptr<TestFocusController> focus_controller_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(KeyboardControllerTest);
 };
 
 class TestKeyboardControllerProxy : public KeyboardControllerProxy {
  public:
   TestKeyboardControllerProxy()
       : window_(new aura::Window(&delegate_)),
-        input_method_(new ui::MockInputMethod(NULL)) {
+        input_method_(ui::CreateInputMethod(NULL,
+                                            gfx::kNullAcceleratedWidget)) {
     window_->Init(ui::LAYER_NOT_DRAWN);
     window_->set_owned_by_parent(false);
   }
 
   virtual ~TestKeyboardControllerProxy() {
     // Destroy the window before the delegate.
     window_.reset();
   }
 
   // Overridden from KeyboardControllerProxy:
@@ skipping 170 matching lines @@
   EXPECT_TRUE(keyboard_container->IsVisible());
 
   input_method->SetFocusedTextInputClient(&no_input_client);
   EXPECT_FALSE(keyboard_container->IsVisible());
 
   input_method->SetFocusedTextInputClient(&input_client);
   EXPECT_TRUE(keyboard_container->IsVisible());
 }
 
 }  // namespace keyboard