Extract content dependency from keyboard code

chrome/browser/ui/ash/keyboard_controller_browsertest.cc

 // Copyright 2014 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/shell.h"
 #include "base/command_line.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/ime/dummy_text_input_client.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/base/ime/input_method_factory.h"
-#include "ui/keyboard/keyboard_constants.h"
+#include "ui/keyboard/content/keyboard_constants.h"
 #include "ui/keyboard/keyboard_controller.h"
-#include "ui/keyboard/keyboard_controller_proxy.h"
 #include "ui/keyboard/keyboard_switches.h"
+#include "ui/keyboard/keyboard_ui.h"
 #include "ui/keyboard/keyboard_util.h"
 
 namespace {
 const int kKeyboardHeightForTest = 100;
 }  // namespace
 
 class VirtualKeyboardWebContentTest : public InProcessBrowserTest {
  public:
   VirtualKeyboardWebContentTest() {}
   ~VirtualKeyboardWebContentTest() override {}
 
   void SetUp() override {
     ui::SetUpInputMethodFactoryForTesting();
     InProcessBrowserTest::SetUp();
   }
 
   // Ensure that the virtual keyboard is enabled.
   void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitch(
         keyboard::switches::kEnableVirtualKeyboard);
   }
 
-  keyboard::KeyboardControllerProxy* proxy() {
-    return keyboard::KeyboardController::GetInstance()->proxy();
+  keyboard::KeyboardUI* ui() {
+    return keyboard::KeyboardController::GetInstance()->ui();
   }
 
  protected:
   void FocusEditableNodeAndShowKeyboard(const gfx::Rect& init_bounds) {
     client.reset(new ui::DummyTextInputClient(ui::TEXT_INPUT_TYPE_TEXT));
-    ui::InputMethod* input_method = proxy()->GetInputMethod();
+    ui::InputMethod* input_method = ui()->GetInputMethod();
     input_method->SetFocusedTextInputClient(client.get());
     input_method->ShowImeIfNeeded();
     // Mock window.resizeTo that is expected to be called after navigate to a
     // new virtual keyboard.
-    proxy()->GetKeyboardWindow()->SetBounds(init_bounds);
+    ui()->GetKeyboardWindow()->SetBounds(init_bounds);
   }
 
   void FocusNonEditableNode() {
     client.reset(new ui::DummyTextInputClient(ui::TEXT_INPUT_TYPE_NONE));
-    ui::InputMethod* input_method = proxy()->GetInputMethod();
+    ui::InputMethod* input_method = ui()->GetInputMethod();
     input_method->SetFocusedTextInputClient(client.get());
   }
 
   void MockEnableIMEInDifferentExtension(const std::string& url,
                                          const gfx::Rect& init_bounds) {
     keyboard::SetOverrideContentUrl(GURL(url));
     keyboard::KeyboardController::GetInstance()->Reload();
     // Mock window.resizeTo that is expected to be called after navigate to a
     // new virtual keyboard.
-    proxy()->GetKeyboardWindow()->SetBounds(init_bounds);
+    ui()->GetKeyboardWindow()->SetBounds(init_bounds);
   }
 
   bool IsKeyboardVisible() const {
     return keyboard::KeyboardController::GetInstance()->keyboard_visible();
   }
 
  private:
   scoped_ptr<ui::DummyTextInputClient> client;
 
   DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardWebContentTest);
@@ skipping 37 matching lines @@
   FocusEditableNodeAndShowKeyboard(test_bounds);
   keyboard::KeyboardController* controller =
       keyboard::KeyboardController::GetInstance();
   const gfx::Rect& screen_bounds = ash::Shell::GetPrimaryRootWindow()->bounds();
   gfx::Rect keyboard_bounds = controller->GetContainerWindow()->bounds();
   EXPECT_EQ(kKeyboardHeightForTest, keyboard_bounds.height());
   EXPECT_EQ(screen_bounds.height(),
             keyboard_bounds.height() + keyboard_bounds.y());
   controller->SetKeyboardMode(keyboard::FLOATING);
   // Move keyboard to a random place.
-  proxy()->GetKeyboardWindow()->SetBounds(gfx::Rect(50, 50, 50, 50));
+  ui()->GetKeyboardWindow()->SetBounds(gfx::Rect(50, 50, 50, 50));
   EXPECT_EQ(gfx::Rect(50, 50, 50, 50),
             controller->GetContainerWindow()->bounds());
 
   MockEnableIMEInDifferentExtension("chrome-extension://domain-1", test_bounds);
   keyboard_bounds = controller->GetContainerWindow()->bounds();
   EXPECT_EQ(kKeyboardHeightForTest, keyboard_bounds.height());
   EXPECT_EQ(screen_bounds.height(),
             keyboard_bounds.height() + keyboard_bounds.y());
 }