Move CharacterComposer into //ui/base/ime

This patch makes CharacterComposer class reusable by other
platforms, by moving character_composer{.h,.cc} files and its
tests and auxiliary scripts out from ui/base/ime/chromeos
into ui/base/ime so that it can be reused by other platforms.

In particular, we intend to use it to properly handle dead keys
in ozone/wayland configuration. The ozone/wayland integration
will be done in a follow-up CL. In the future, ozone/x11 could
also benefit from this.

BUG=921947

Change-Id: Iff6cd82da9696279c0cd21afad7aba79a58baa8d
Reviewed-on: https://chromium-review.googlesource.com/c/1446477
Commit-Queue: Nick Yamane <nickdiego@igalia.com>
Reviewed-by: Shu Chen <shuchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#627991}

ui/base/BUILD.gn

@@ -848,7 +848,6 @@ test("ui_base_unittests") {
   if (build_ime) {
     sources += [
       "ime/candidate_window_unittest.cc",
-      "ime/chromeos/character_composer_unittest.cc",
       "ime/chromeos/extension_ime_util_unittest.cc",
       "ime/chromeos/ime_keyboard_unittest.cc",
       "ime/chromeos/input_method_util_unittest.cc",
@@ -870,6 +869,11 @@ test("ui_base_unittests") {
     if (use_x11) {
       sources += [ "ime/composition_text_util_pango_unittest.cc" ]
     }
+    if (is_chromeos || use_ozone) {
+      sources += [
+        "ime/character_composer_unittest.cc",
+      ]
+    }
   }
 
   deps = [

ui/base/ime/BUILD.gn

@@ -98,8 +98,6 @@ jumbo_component("ime") {
 
   if (is_chromeos) {
     sources += [
-      "chromeos/character_composer.cc",
-      "chromeos/character_composer.h",
       "chromeos/component_extension_ime_manager.cc",
       "chromeos/component_extension_ime_manager.h",
       "chromeos/extension_ime_util.cc",
@@ -175,6 +173,14 @@ jumbo_component("ime") {
     ]
   }
 
+  if (is_chromeos || use_ozone) {
+    sources += [
+      "character_composer.cc",
+      "character_composer.h",
+    ]
+    deps += [ "//ui/events:dom_keycode_converter" ]
+  }
+
   if (!toolkit_views && !use_aura) {
     sources -= [
       "input_method_factory.cc",
@@ -190,7 +196,6 @@ jumbo_component("ime") {
       "//services/ws/public/cpp/input_devices",
       "//ui/base/ime/chromeos/public/interfaces",
       "//ui/chromeos/strings",
-      "//ui/events:dom_keycode_converter",
     ]
     sources += [
       "chromeos/ime_keyboard_mus.cc",

ui/base/ime/chromeos/PRESUBMIT.py → ui/base/ime/PRESUBMIT.py

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-"""Presubmit script for ui/base/ime/chromeos
+"""Presubmit script for ui/base/ime
 
 See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
 for more details about the presubmit API built into depot_tools.

ui/base/ime/chromeos/character_composer.cc → ui/base/ime/character_composer.cc

@@ -2,10 +2,11 @@
 // 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 "ui/base/ime/character_composer.h"
 
 #include <algorithm>
 #include <iterator>
+#include <string>
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversion_utils.h"
@@ -18,7 +19,7 @@
 
 namespace {
 
-#include "ui/base/ime/chromeos/character_composer_data.h"
+#include "ui/base/ime/character_composer_data.h"
 
 bool CheckCharacterComposeTable(
     const ui::CharacterComposer::ComposeBuffer& compose_sequence,
@@ -58,11 +59,9 @@ int KeycodeToHexDigit(unsigned int keycode) {
 
 namespace ui {
 
-CharacterComposer::CharacterComposer() : composition_mode_(KEY_SEQUENCE_MODE) {
-}
+CharacterComposer::CharacterComposer() : composition_mode_(KEY_SEQUENCE_MODE) {}
 
-CharacterComposer::~CharacterComposer() {
-}
+CharacterComposer::~CharacterComposer() {}
 
 void CharacterComposer::Reset() {
   compose_buffer_.clear();

ui/base/ime/chromeos/character_composer.h → ui/base/ime/character_composer.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_BASE_IME_CHROMEOS_CHARACTER_COMPOSER_H_
-#define UI_BASE_IME_CHROMEOS_CHARACTER_COMPOSER_H_
+#ifndef UI_BASE_IME_CHARACTER_COMPOSER_H_
+#define UI_BASE_IME_CHARACTER_COMPOSER_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -102,6 +102,7 @@ class ComposeChecker {
   virtual CheckSequenceResult CheckSequence(
       const ui::CharacterComposer::ComposeBuffer& sequence,
       uint32_t* composed_character) const = 0;
+
  private:
   DISALLOW_COPY_AND_ASSIGN(ComposeChecker);
 };
@@ -115,7 +116,7 @@ class TreeComposeChecker : public ComposeChecker {
     const uint16_t* tree;
   };
 
-  TreeComposeChecker(const CompositionData& data) : data_(data) {}
+  explicit TreeComposeChecker(const CompositionData& data) : data_(data) {}
   CheckSequenceResult CheckSequence(
       const ui::CharacterComposer::ComposeBuffer& sequence,
       uint32_t* composed_character) const override;
@@ -127,4 +128,4 @@ class TreeComposeChecker : public ComposeChecker {
 
 }  // namespace ui
 
-#endif  // UI_BASE_IME_CHROMEOS_CHARACTER_COMPOSER_H_
+#endif  // UI_BASE_IME_CHARACTER_COMPOSER_H_

ui/base/ime/chromeos/character_composer_unittest.cc → ui/base/ime/character_composer_unittest.cc

@@ -2,7 +2,7 @@
 // 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 "ui/base/ime/character_composer.h"
 
 #include <stdint.h>
 
@@ -63,9 +63,9 @@ class CharacterComposerTest : public testing::Test {
                             DomCode code,
                             int flags,
                             base::char16 character) const {
-    KeyEvent* event = new KeyEvent(ET_KEY_PRESSED, vkey, code, flags,
-                                   DomKey::FromCharacter(character),
-                                   EventTimeForNow());
+    KeyEvent* event =
+        new KeyEvent(ET_KEY_PRESSED, vkey, code, flags,
+                     DomKey::FromCharacter(character), EventTimeForNow());
     return event;
   }
 
@@ -233,7 +233,7 @@ TEST_F(CharacterComposerTest, MainTableIsCorrectlyOrdered) {
 // This file is included here intentionally, instead of the top of the file,
 // because including this file at the top of the file will define a
 // global constant and contaminate the global namespace.
-#include "ui/base/ime/chromeos/character_composer_data.h"
+#include "ui/base/ime/character_composer_data.h"
   const int kTypes = 2;
 
   // Record the subtree locations and check subtable sizes.
@@ -331,8 +331,7 @@ TEST_F(CharacterComposerTest, HexadecimalCompositionPreedit) {
   ExpectUnicodeKeyFiltered(VKEY_BACK, DomCode::BACKSPACE, EF_NONE, '\b');
   EXPECT_EQ(ASCIIToUTF16("u304"), character_composer_.preedit_string());
   ExpectUnicodeKeyFiltered(VKEY_2, DomCode::DIGIT2, EF_NONE, '2');
-  ExpectUnicodeKeyComposed(VKEY_RETURN, DomCode::ENTER, EF_NONE,
-                           '\r',
+  ExpectUnicodeKeyComposed(VKEY_RETURN, DomCode::ENTER, EF_NONE, '\r',
                            base::string16(1, 0x3042));
   EXPECT_EQ(ASCIIToUTF16(""), character_composer_.preedit_string());
 
@@ -462,8 +461,7 @@ TEST_F(CharacterComposerTest,
   EXPECT_EQ(ASCIIToUTF16("u304"), character_composer_.preedit_string());
   ExpectUnicodeKeyFiltered(ui::VKEY_2, DomCode::DIGIT2, kControlShift, 0);
   EXPECT_EQ(ASCIIToUTF16("u3042"), character_composer_.preedit_string());
-  ExpectUnicodeKeyComposed(VKEY_RETURN, DomCode::ENTER, kControlShift,
-                           '\r',
+  ExpectUnicodeKeyComposed(VKEY_RETURN, DomCode::ENTER, kControlShift, '\r',
                            base::string16(1, 0x3042));
   EXPECT_EQ(ASCIIToUTF16(""), character_composer_.preedit_string());
 

ui/base/ime/input_method_chromeos.h

@@ -15,7 +15,7 @@
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
-#include "ui/base/ime/chromeos/character_composer.h"
+#include "ui/base/ime/character_composer.h"
 #include "ui/base/ime/composition_text.h"
 #include "ui/base/ime/ime_input_context_handler_interface.h"
 #include "ui/base/ime/input_method_base.h"