Revise ui::DomKey to unify character and non-character codes.

ui/base/ime/chromeos/character_composer_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/base/ime/chromeos/character_composer.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event.h"
@@ skipping 16 matching lines @@
 const base::char16 kCombiningHorn = 0x031B;
 
 }  // namespace
 
 class CharacterComposerTest : public testing::Test {
  protected:
   // Returns a |KeyEvent| for a dead key press.
   KeyEvent* DeadKeyPress(base::char16 combining_character) const {
     KeyEvent* event =
         new KeyEvent(ET_KEY_PRESSED, VKEY_UNKNOWN, DomCode::NONE, EF_NONE,
-                     DomKey::DEAD, combining_character, EventTimeForNow());
+                     DomKey::DeadKeyFromCombiningCharacter(combining_character),
+                     EventTimeForNow());
     return event;
   }
 
   // Expects key is filtered and no character is composed.
   void ExpectDeadKeyFiltered(base::char16 combining_character) {
     scoped_ptr<KeyEvent> event(DeadKeyPress(combining_character));
     EXPECT_TRUE(character_composer_.FilterKeyPress(*event));
     EXPECT_TRUE(character_composer_.composed_character().empty());
   }
 
   // Expects key is filtered and the given character is composed.
   void ExpectDeadKeyComposed(base::char16 combining_character,
                              const base::string16& expected_character) {
     scoped_ptr<KeyEvent> event(DeadKeyPress(combining_character));
     EXPECT_TRUE(character_composer_.FilterKeyPress(*event));
     EXPECT_EQ(expected_character, character_composer_.composed_character());
   }
 
   // Returns a |KeyEvent| for a character key press.
   KeyEvent* UnicodeKeyPress(KeyboardCode vkey,
                             DomCode code,
                             int flags,
                             base::char16 character) const {
     KeyEvent* event = new KeyEvent(ET_KEY_PRESSED, vkey, code, flags,
-                                   CharacterToDomKey(character), character,
+                                   DomKey::FromCharacter(character),
                                    EventTimeForNow());
     return event;
   }
 
   // Expects key is not filtered and no character is composed.
   void ExpectUnicodeKeyNotFiltered(KeyboardCode vkey,
                                    DomCode code,
                                    int flags,
                                    base::char16 character) {
     scoped_ptr<KeyEvent> event(UnicodeKeyPress(vkey, code, flags, character));
@@ skipping 428 matching lines @@
   ExpectUnicodeKeyFiltered(VKEY_3, DomCode::DIGIT3, EF_NONE, '3');
   ExpectUnicodeKeyFiltered(VKEY_0, DomCode::DIGIT0, EF_NONE, '0');
   ExpectDeadKeyFiltered(kCombiningAcute);
   ExpectUnicodeKeyFiltered(VKEY_4, DomCode::DIGIT4, EF_NONE, '4');
   ExpectUnicodeKeyFiltered(VKEY_2, DomCode::DIGIT2, EF_NONE, '2');
   ExpectUnicodeKeyComposed(VKEY_SPACE, DomCode::SPACE, EF_NONE, ' ',
                            base::string16(1, 0x3042));
 }
 
 }  // namespace ui