Remove views::KeyEvent, replacing uses of it with ui::KeyEvent.

content/test/browser_test_base.cc

 // Copyright (c) 2011 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 "content/test/browser_test_base.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 #include "sandbox/win/src/dep.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #include "base/system_monitor/system_monitor.h"
 #endif
 
+#if defined(USE_AURA)
+#include "ui/aura/test/aura_test_helper.h"
+#endif
+
 extern int BrowserMain(const content::MainFunctionParams&);
 
 BrowserTestBase::BrowserTestBase() {
 #if defined(OS_MACOSX)
   base::mac::SetOverrideAmIBundled(true);
   base::SystemMonitor::AllocateSystemIOPorts();
 #endif
 }
 
 BrowserTestBase::~BrowserTestBase() {
 }
 
 void BrowserTestBase::SetUp() {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
 
   // The tests assume that file:// URIs can freely access other file:// URIs.
   command_line->AppendSwitch(switches::kAllowFileAccessFromFiles);
 
   command_line->AppendSwitch(switches::kDomAutomationController);
 
   content::MainFunctionParams params(*command_line);
   params.ui_task =
       new base::Closure(
           base::Bind(&BrowserTestBase::ProxyRunTestOnMainThreadLoop, this));
 
   SetUpInProcessBrowserTestFixture();
+#if defined(USE_AURA)
+  aura_test_helper_.reset(new aura::test::AuraTestHelper(&ui_loop_));
+  aura_test_helper_->SetUp();
+#endif  // USE_AURA
   BrowserMain(params);
   TearDownInProcessBrowserTestFixture();
 }
 
 void BrowserTestBase::TearDown() {
+#if defined(USE_AURA)
+  aura_test_helper_->TearDown();
+#endif
 }
 
 void BrowserTestBase::ProxyRunTestOnMainThreadLoop() {
   RunTestOnMainThreadLoop();
 }
 
 void BrowserTestBase::CreateTestServer(const char* test_server_base) {
   CHECK(!test_server_.get());
   test_server_.reset(new net::TestServer(
       net::TestServer::TYPE_HTTP,
       net::TestServer::kLocalhost,
       FilePath().AppendASCII(test_server_base)));
 }