Revert of Moves code from chromeos/ime to ui/base/ime/chromeos.

chromeos/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/allocator.gni")
 import("//build/config/ui.gni")
 import("//third_party/protobuf/proto_library.gni")
 
 assert(is_chromeos, "Non-ChromeOS builds must not depend on //chromeos")
 
@@ skipping 21 matching lines @@
     "//third_party/icu",
     "//third_party/libxml",
     "//third_party/protobuf:protobuf_lite",
     "//ui/accelerometer",
     "//url",
     ":cryptohome_proto",
     ":power_manager_proto"
   ]
   sources = gypi_values.chromeos_sources
   defines = [ "CHROMEOS_IMPLEMENTATION" ]
+  if (use_x11) {
+    configs += [ "//build/config/linux:x11" ]
+    deps += [ "//ui/gfx/x" ]
+    sources -= [
+      "ime/ime_keyboard_ozone.cc",
+      "ime/ime_keyboard_ozone.h",
+    ]
+  } else {
+    sources -= [
+      "ime/ime_keyboard_x11.cc",
+      "ime/ime_keyboard_x11.h",
+    ]
+  }
 }
 
 static_library("test_support") {
   testonly = true
   configs += [
     "//build/config/linux:dbus",
   ]
   deps = [
     "//testing/gmock",
     ":chromeos",
@@ skipping 62 matching lines @@
     "dbus/fake_cros_disks_client.cc",
     "dbus/fake_cros_disks_client.h",
     "dbus/fake_power_manager_client.cc",
     "dbus/fake_power_manager_client.h",
     "dbus/fake_session_manager_client.cc",
     "dbus/fake_session_manager_client.h",
     "dbus/fake_shill_manager_client.cc",
     "dbus/fake_shill_manager_client.h",
     "dbus/fake_update_engine_client.cc",
     "dbus/fake_update_engine_client.h",
+    "ime/fake_input_method_delegate.cc",
+    "ime/fake_input_method_delegate.h",
   ]
 }
 
 test("chromeos_unittests") {
   configs += [
     "//build/config/linux:dbus",
     "//net/third_party/nss/ssl:ssl_config",
   ]
   deps = [
     "//base/test:run_all_unittests",
@@ skipping 48 matching lines @@
   proto_out_dir = "chromeos/dbus/cryptohome"
 }
 
 proto_library("cryptohome_signkey_proto") {
   sources = [
     "//third_party/cros_system_api/dbus/cryptohome/signed_secret.proto",
   ]
 
   proto_out_dir = "chromeos/cryptohome"
 }