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

ui/views/controls/combobox/native_combobox_views_unittest.cc

 // Copyright (c) 2012 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/utf_string_conversions.h"
+#include "ui/base/event.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/combobox/native_combobox_views.h"
 #include "ui/views/ime/mock_input_method.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/native_widget_private.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 // A wrapper of Combobox to intercept the result of OnKeyPressed() and
 // OnKeyReleased() methods.
 class TestCombobox : public views::Combobox {
  public:
   explicit TestCombobox(ui::ComboboxModel* model)
       : Combobox(model),
         key_handled_(false),
         key_received_(false) {
   }
 
-  virtual bool OnKeyPressed(const views::KeyEvent& e) OVERRIDE {
+  virtual bool OnKeyPressed(const ui::KeyEvent& e) OVERRIDE {
     key_received_ = true;
     key_handled_ = views::Combobox::OnKeyPressed(e);
     return key_handled_;
   }
 
-  virtual bool OnKeyReleased(const views::KeyEvent& e) OVERRIDE {
+  virtual bool OnKeyReleased(const ui::KeyEvent& e) OVERRIDE {
     key_received_ = true;
     key_handled_ = views::Combobox::OnKeyReleased(e);
     return key_handled_;
   }
 
   bool key_handled() const { return key_handled_; }
   bool key_received() const { return key_received_; }
 
   void clear() {
     key_received_ = key_handled_ = false;
@@ skipping 72 matching lines @@
     widget_->ReplaceInputMethod(input_method_);
 
     // Assumes the Widget is always focused.
     input_method_->OnFocus();
 
     combobox_->RequestFocus();
   }
 
  protected:
   void SendKeyEvent(ui::KeyboardCode key_code) {
-    KeyEvent event(ui::ET_KEY_PRESSED, key_code, 0);
+    ui::KeyEvent event(ui::ET_KEY_PRESSED, key_code, 0);
     input_method_->DispatchKeyEvent(event);
   }
 
   View* GetFocusedView() {
     return widget_->GetFocusManager()->GetFocusedView();
   }
 
   // We need widget to populate wrapper class.
   Widget* widget_;
 
@@ skipping 49 matching lines @@
   widget_->SetContentsView(container);
   container->AddChildView(combobox_);
 
   combobox_view_ = static_cast<NativeComboboxViews*>(
       combobox_->GetNativeWrapperForTesting());
   ASSERT_TRUE(combobox_view_);
   ASSERT_FALSE(combobox_view_->enabled());
 }
 
 }  // namespace views