Revert r235502 "Add a full screen virtual keyboard to virtual keyboard root window"

Test has been failing on Win8 Aura since it landed.

[ RUN      ] VirtualKeyboardWindowControllerTest.VirtualKeyboardWindowTest
[1816:612:1115/193527:1412105:FATAL:display_manager.cc(571)] Check failed: 1u == updated_display_info_list.size() (1 vs. 2)Multiple display test does not work on Win8 bots. Please skip (don't disable) the test using SupportsMultipleDisplays()
Backtrace:
        base::debug::StackTrace::StackTrace [0x6C8EBBF1+33]
        logging::LogMessage::~LogMessage [0x6C71D2FE+94]
        ash::internal::DisplayManager::UpdateDisplays [0x5BA229F5+293]
        ash::internal::DisplayManager::OnNativeDisplaysChanged [0x5BA22173+2723]
        ash::internal::DisplayManager::InitFromCommandLine [0x5BA1E281+817]
        ash::Shell::Init [0x5B7628A2+210]
        ash::Shell::CreateInstance [0x5B75C8D9+361]
        ash::test::AshTestHelper::SetUp [0x01782E29+281]
        ash::test::AshTestBase::SetUp [0x017753AC+332]
        ash::test::VirtualKeyboardWindowControllerTest::SetUp [0x016A57D7+247]
        testing::internal::HandleExceptionsInMethodIfSupported<testing::Test,void> [0x0174E3BF+319]
        testing::Test::Run [0x01738DDB+107]
        testing::TestInfo::Run [0x017397ED+221]
        testing::TestCase::Run [0x01739F9F+239]
        testing::internal::UnitTestImpl::RunAllTests [0x017408ED+701]
        testing::internal::HandleExceptionsInMethodIfSupported<testing::internal::UnitTestImpl,bool> [0x0174EFE7+327]
        testing::UnitTest::Run [0x0173F150+192]
        base::TestSuite::Run [0x0172DD00+240]
        main [0x01647767+103]
        __tmainCRTStartup [0x018B870F+447] (f:\dd\vctools\crt_bld\self_x86\crt\src\crtexe.c:555)
        mainCRTStartup [0x018B853F+15] (f:\dd\vctools\crt_bld\self_x86\crt\src\crtexe.c:371)
        BaseThreadInitThunk [0x750D8543+14]
        RtlInitializeExceptionChain [0x775DAC69+133]
        RtlInitializeExceptionChain [0x775DAC3C+88]

http://build.chromium.org/p/chromium.win/builders/Win8%20Aura/builds/12680/steps/ash_unittests/logs/stdio

BUG=310331
TBR=bshe@chromium.org

Review URL: https://codereview.chromium.org/74693002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235520 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 1 insertions, 82 deletions

diff --git a/ash/shell/keyboard_controller_proxy_stub.cc b/ash/shell/keyboard_controller_proxy_stub.cc
deleted file mode 100644
index 700c834..0000000
--- a/ash/shell/keyboard_controller_proxy_stub.cc
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 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 "ash/shell/keyboard_controller_proxy_stub.h"
-
-#include "ash/shell.h"
-#include "ash/shell_delegate.h"
-#include "ui/aura/window.h"
-#include "ui/views/corewm/input_method_event_filter.h"
-
-using namespace content;
-
-namespace ash {
-
-KeyboardControllerProxyStub::KeyboardControllerProxyStub() {
-}
-
-KeyboardControllerProxyStub::~KeyboardControllerProxyStub() {
-}
-
-aura::Window* KeyboardControllerProxyStub::GetKeyboardWindow() {
-  aura::Window* window = new aura::Window(&delegate_);
-  window->Init(ui::LAYER_NOT_DRAWN);
-  return window;
-}
-
-BrowserContext* KeyboardControllerProxyStub::GetBrowserContext() {
-  return Shell::GetInstance()->delegate()->GetCurrentBrowserContext();
-}
-
-ui::InputMethod* KeyboardControllerProxyStub::GetInputMethod() {
-  return Shell::GetInstance()->input_method_filter()->input_method();
-}
-
-void KeyboardControllerProxyStub::RequestAudioInput(
-    WebContents* web_contents,
-    const MediaStreamRequest& request,
-    const MediaResponseCallback& callback) {
-}
-
-}  // namespace ash
diff --git a/ash/shell/keyboard_controller_proxy_stub.h b/ash/shell/keyboard_controller_proxy_stub.h
deleted file mode 100644
index 639e5d2..0000000
--- a/ash/shell/keyboard_controller_proxy_stub.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 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.
-
-#ifndef ASH_SHELL_KEYBOARD_CONTROLLER_PROXY_STUB_H_
-#define ASH_SHELL_KEYBOARD_CONTROLLER_PROXY_STUB_H_
-
-#include "ui/aura/test/test_window_delegate.h"
-#include "ui/keyboard/keyboard_controller_proxy.h"
-
-namespace aura {
-class Window;
-}  // namespace aura
-
-namespace ash {
-
-// Stub implementation of KeyboardControllerProxy
-class KeyboardControllerProxyStub : public keyboard::KeyboardControllerProxy {
- public:
-  KeyboardControllerProxyStub();
-  virtual ~KeyboardControllerProxyStub();
-
-  virtual aura::Window* GetKeyboardWindow() OVERRIDE;
-
- private:
-  // Overridden from keyboard::KeyboardControllerProxy:
-  virtual content::BrowserContext* GetBrowserContext() OVERRIDE;
-  virtual ui::InputMethod* GetInputMethod() OVERRIDE;
-  virtual void RequestAudioInput(content::WebContents* web_contents,
-      const content::MediaStreamRequest& request,
-      const content::MediaResponseCallback& callback) OVERRIDE;
-
-  aura::test::TestWindowDelegate delegate_;
-  DISALLOW_COPY_AND_ASSIGN(KeyboardControllerProxyStub);
-};
-
-}  // namespace ash
-
-#endif  // ASH_SHELL_KEYBOARD_CONTROLLER_PROXY_STUB_H_
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc
index acc8e3d..44d955f 100644
--- a/ash/shell/shell_delegate_impl.cc
+++ b/ash/shell/shell_delegate_impl.cc
@@ -9,13 +9,13 @@
 #include "ash/default_accessibility_delegate.h"
 #include "ash/default_user_wallpaper_delegate.h"
 #include "ash/host/root_window_host_factory.h"
+#include "ash/keyboard_controller_proxy_stub.h"
 #include "ash/media_delegate.h"
 #include "ash/new_window_delegate.h"
 #include "ash/session_state_delegate.h"
 #include "ash/session_state_delegate_stub.h"
 #include "ash/shell/context_menu.h"
 #include "ash/shell/example_factory.h"
-#include "ash/shell/keyboard_controller_proxy_stub.h"
 #include "ash/shell/launcher_delegate_impl.h"
 #include "ash/shell/toplevel_window.h"
 #include "ash/shell_window_ids.h"