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

ui/views/controls/textfield/native_textfield_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 <string>
 #include <vector>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/pickle.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "googleurl/src/gurl.h"
 #include "grit/ui_strings.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
+#include "ui/base/event.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/render_text.h"
 #include "ui/views/controls/textfield/native_textfield_views.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/controls/textfield/textfield_views_model.h"
 #include "ui/views/events/event.h"
@@ skipping 10 matching lines @@
 // A wrapper of Textfield to intercept the result of OnKeyPressed() and
 // OnKeyReleased() methods.
 class TestTextfield : public views::Textfield {
  public:
   explicit TestTextfield(StyleFlags style)
       : Textfield(style),
         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::Textfield::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::Textfield::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 58 matching lines @@
     ViewsTestBase::TearDown();
   }
 
   // TextfieldController:
   virtual void ContentsChanged(Textfield* sender,
                                const string16& new_contents) {
     ASSERT_NE(last_contents_, new_contents);
     last_contents_ = new_contents;
   }
 
-  virtual bool HandleKeyEvent(Textfield* sender, const KeyEvent& key_event) {
+  virtual bool HandleKeyEvent(Textfield* sender,
+                              const ui::KeyEvent& key_event) {
     // TODO(oshima): figure out how to test the keystroke.
     return false;
   }
 
   virtual void OnBeforeUserAction(Textfield* sender) {
     ++on_before_user_action_;
   }
 
   virtual void OnAfterUserAction(Textfield* sender) {
     ++on_after_user_action_;
@@ skipping 51 matching lines @@
   }
 
  protected:
   void SendKeyEvent(ui::KeyboardCode key_code,
                     bool shift,
                     bool control,
                     bool caps_lock) {
     int flags = (shift ? ui::EF_SHIFT_DOWN : 0) |
         (control ? ui::EF_CONTROL_DOWN : 0) |
         (caps_lock ? ui::EF_CAPS_LOCK_DOWN : 0);
-    KeyEvent event(ui::ET_KEY_PRESSED, key_code, flags);
+    ui::KeyEvent event(ui::ET_KEY_PRESSED, key_code, flags);
     input_method_->DispatchKeyEvent(event);
   }
 
   void SendKeyEvent(ui::KeyboardCode key_code, bool shift, bool control) {
     SendKeyEvent(key_code, shift, control, false);
   }
 
   void SendKeyEvent(ui::KeyboardCode key_code) {
     SendKeyEvent(key_code, false, false);
   }
 
   void SendKeyEvent(char16 ch) {
     if (ch < 0x80) {
       ui::KeyboardCode code =
           ch == ' ' ? ui::VKEY_SPACE :
           static_cast<ui::KeyboardCode>(ui::VKEY_A + ch - 'a');
       SendKeyEvent(code);
     } else {
-      KeyEvent event(ui::ET_KEY_PRESSED, ui::VKEY_UNKNOWN, 0);
+      ui::KeyEvent event(ui::ET_KEY_PRESSED, ui::VKEY_UNKNOWN, 0);
       event.set_character(ch);
       input_method_->DispatchKeyEvent(event);
     }
   }
 
   string16 GetClipboardText() const {
     string16 text;
     views::ViewsDelegate::views_delegate->GetClipboard()->
         ReadText(ui::Clipboard::BUFFER_STANDARD, &text);
     return text;
@@ skipping 1421 matching lines @@
     EXPECT_EQ(char_rect[i], actual_rect) << " i=" << i;
   }
 
   // Return false if the index is out of range.
   EXPECT_FALSE(client->GetCompositionCharacterBounds(char_count, &rect));
   EXPECT_FALSE(client->GetCompositionCharacterBounds(char_count + 1, &rect));
   EXPECT_FALSE(client->GetCompositionCharacterBounds(char_count + 100, &rect));
 }
 
 }  // namespace views