ui: Fold ime gypi files directly into their main targets (ui_base and ui_unittests).

ui/ui_unittests.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 42 matching lines @@
         'base/cocoa/controls/blue_label_button_unittest.mm',
         'base/cocoa/controls/hover_image_menu_button_unittest.mm',
         'base/cocoa/controls/hyperlink_button_cell_unittest.mm',
         'base/cocoa/focus_tracker_unittest.mm',
         'base/cocoa/fullscreen_window_manager_unittest.mm',
         'base/cocoa/hover_image_button_unittest.mm',
         'base/cocoa/menu_controller_unittest.mm',
         'base/cocoa/nsgraphics_context_additions_unittest.mm',
         'base/cocoa/tracking_area_unittest.mm',
         'base/dragdrop/os_exchange_data_provider_aurax11_unittest.cc',
+        'base/ime/candidate_window_unittest.cc',
+        'base/ime/chromeos/character_composer_unittest.cc',
+        'base/ime/composition_text_util_pango_unittest.cc',
+        'base/ime/input_method_base_unittest.cc',
+        'base/ime/input_method_chromeos_unittest.cc',
+        'base/ime/remote_input_method_win_unittest.cc',
+        'base/ime/win/imm32_manager_unittest.cc',
+        'base/ime/win/tsf_input_scope_unittest.cc',
         'base/models/list_model_unittest.cc',
         'base/models/list_selection_model_unittest.cc',
         'base/models/tree_node_model_unittest.cc',
         'base/test/data/resource.h',
         'base/text/bytes_formatting_unittest.cc',
         'base/view_prop_unittest.cc',
         'base/webui/web_ui_util_unittest.cc',
         'gfx/canvas_unittest_mac.mm',
         'gfx/platform_font_mac_unittest.mm',
       ],
       'include_dirs': [
         '../',
       ],
       'conditions': [
         ['OS!="ios"', {
           'sources' : ['<@(_all_sources)'],
-          'includes': [
-            'base/ime/ime_unittests.gypi',
-          ],
         }, {  # OS=="ios"
           'sources' : [
             '<@(_common_sources)',
           ],
           # The ResourceBundle unittest expects a locale.pak file to exist in
           # the bundle for English-US. Copy it in from where it was generated
           # by ui_resources.gyp:ui_test_pak.
           'mac_bundle_resources': [
             '<(PRODUCT_DIR)/ui/en.lproj/locale.pak',
           ],
@@ skipping 116 matching lines @@
             'chromeos/ui_chromeos.gyp:ui_chromeos',
             'events/events.gyp:gesture_detection',
           ],
           'sources': [
             'chromeos/touch_exploration_controller_unittest.cc'
           ],
           'sources!': [
             'base/dragdrop/os_exchange_data_provider_aurax11_unittest.cc',
           ],
         }],
+        ['chromeos==0 or use_x11==0', {
+          'sources!': [
+            'base/ime/chromeos/character_composer_unittest.cc',
+            'base/ime/input_method_chromeos_unittest.cc',
+          ],
+        }],
+        ['use_x11==0', {
+          'sources!': [
+            'base/ime/composition_text_util_pango_unittest.cc',
+          ],
+        }],
       ],
       'target_conditions': [
         ['OS == "ios"', {
           'sources/': [
             # Pull in specific Mac files for iOS (which have been filtered out
             # by file name rules).
             ['include', '^base/l10n/l10n_util_mac_unittest\\.mm$'],
           ],
         }],
       ],
@@ skipping 23 matching lines @@
           ],
           'variables': {
             'test_suite_name': 'ui_unittests',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }