Rename KEY_ constants to avoid conflict with <linux/input.h>

ui/views/controls/combobox/combobox_unittest.cc

 // 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 "ui/views/controls/combobox/combobox.h"
 
 #include <set>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 679 matching lines @@
 
 TEST_F(ComboboxTest, TypingPrefixNotifiesListener) {
   InitCombobox(NULL);
 
   TestComboboxListener listener;
   combobox_->set_listener(&listener);
   ui::TextInputClient* input_client =
       widget_->GetInputMethod()->GetTextInputClient();
 
   // Type the first character of the second menu item ("JELLY").
-  ui::KeyEvent key_event(ui::ET_KEY_PRESSED, ui::VKEY_J, ui::DomCode::KEY_J, 0,
+  ui::KeyEvent key_event(ui::ET_KEY_PRESSED, ui::VKEY_J, ui::DomCode::US_J, 0,
                          ui::DomKey::FromCharacter('J'), ui::EventTimeForNow());
 
   input_client->InsertChar(key_event);
   EXPECT_EQ(1, listener.actions_performed());
   EXPECT_EQ(1, listener.perform_action_index());
 
   // Type the second character of "JELLY", item shouldn't change and
   // OnPerformAction() shouldn't be re-called.
   key_event =
-      ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_E, ui::DomCode::KEY_E, 0,
+      ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_E, ui::DomCode::US_E, 0,
                    ui::DomKey::FromCharacter('E'), ui::EventTimeForNow());
   input_client->InsertChar(key_event);
   EXPECT_EQ(1, listener.actions_performed());
   EXPECT_EQ(1, listener.perform_action_index());
 
   // Clears the typed text.
   combobox_->OnBlur();
   combobox_->RequestFocus();
 
   // Type the first character of "PEANUT BUTTER", which should change the
   // selected index and perform an action.
   key_event =
-      ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_E, ui::DomCode::KEY_P, 0,
+      ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_E, ui::DomCode::US_P, 0,
                    ui::DomKey::FromCharacter('P'), ui::EventTimeForNow());
   input_client->InsertChar(key_event);
   EXPECT_EQ(2, listener.actions_performed());
   EXPECT_EQ(2, listener.perform_action_index());
 }
 
 // Test properties on the Combobox menu model.
 TEST_F(ComboboxTest, MenuModel) {
   const int kSeparatorIndex = 3;
   std::set<int> separators;
@@ skipping 25 matching lines @@
   EXPECT_EQ(ASCIIToUTF16("JELLY"), menu_model->GetLabelAt(1));
 
   // Check that with STYLE_ACTION, the first item (only) is not shown.
   EXPECT_TRUE(menu_model->IsVisibleAt(0));
   combobox_->SetStyle(Combobox::STYLE_ACTION);
   EXPECT_FALSE(menu_model->IsVisibleAt(0));
   EXPECT_TRUE(menu_model->IsVisibleAt(1));
 }
 
 }  // namespace views