Re-lands 58186:

base/base.gyp

 # Copyright (c) 2010 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,
   },
   'includes': [
     'base.gypi',
@@ skipping 80 matching lines @@
         'hmac_unittest.cc',
         'id_map_unittest.cc',
         'i18n/char_iterator_unittest.cc',
         'i18n/file_util_icu_unittest.cc',
         'i18n/icu_string_conversions_unittest.cc',
         'i18n/rtl_unittest.cc',
         'i18n/word_iterator_unittest.cc',
         'json/json_reader_unittest.cc',
         'json/json_writer_unittest.cc',
         'json/string_escape_unittest.cc',
-        'keyboard_code_conversion_unittest.cc',
         'lazy_instance_unittest.cc',
         'leak_tracker_unittest.cc',
         'linked_list_unittest.cc',
         'linked_ptr_unittest.cc',
         'lock_unittest.cc',
         'mac_util_unittest.mm',
         'message_loop_proxy_impl_unittest.cc',
         'message_loop_unittest.cc',
         'message_pump_glib_unittest.cc',
         'non_thread_safe_unittest.cc',
@@ skipping 196 matching lines @@
       ],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: