Merge 212415 "reland of http://crrev.com/212230 Create top-level..."

ui/keyboard/keyboard.gyp

 # Copyright (c) 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 59 matching lines @@
         'keyboard_util.cc',
         'keyboard_util.h',
       ]
     },
     {
       'target_name': 'keyboard_unittests',
       'type': '<(gtest_target_type)',
       'dependencies': [
         '../../base/base.gyp:base',
         '../../base/base.gyp:test_support_base',
-        '../../content/content.gyp:content_browser',
+        '../../content/content.gyp:content',
         '../../skia/skia.gyp:skia',
         '../../testing/gtest.gyp:gtest',
         '../aura/aura.gyp:aura',
         '../aura/aura.gyp:aura_test_support',
         '../compositor/compositor.gyp:compositor',
         '../ui.gyp:run_ui_unittests',
         '../ui.gyp:ui',
         'keyboard',
       ],
       'sources': [
         'keyboard_controller_unittest.cc',
         'keyboard_test_suite.cc',
       ],
       'conditions': [
         [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [
                 '../../base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         }],
       ],
     },
   ],
 }