Revert 225857 "gfx: Create a separate gfx component out of ui."

trunk/src/chrome/chrome_tests.gypi

 # 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' : {
     'chromedriver_unittest_sources': [
       'test/chromedriver/capabilities_unittest.cc',
       'test/chromedriver/chrome/chrome_finder_unittest.cc',
       'test/chromedriver/chrome/console_logger_unittest.cc',
       'test/chromedriver/chrome/device_manager_unittest.cc',
@@ skipping 471 matching lines @@
     {
       'target_name': 'automation_client_lib',
       'type': 'static_library',
       'hard_dependency': 1,
       'dependencies': [
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../net/net.gyp:net',
         '../third_party/zlib/zlib.gyp:minizip',
         '../third_party/zlib/zlib.gyp:zlib',
-        '../ui/gfx/gfx.gyp:gfx',
         '../ui/ui.gyp:ui',
         '../url/url.gyp:url_lib',
       ],
       'include_dirs': [
         '..',
         '<(SHARED_INTERMEDIATE_DIR)',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '<(SHARED_INTERMEDIATE_DIR)',
@@ skipping 166 matching lines @@
       'target_name': 'chromedriver_lib',
       'type': 'static_library',
       'hard_dependency': 1,
       'dependencies': [
         'automation_client_lib',
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../crypto/crypto.gyp:crypto',
         '../net/net.gyp:http_server',
         '../net/net.gyp:net',
-        '../ui/gfx/gfx.gyp:gfx',
         '../ui/ui.gyp:ui',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/version.cc',
         '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/version.h',
         '../third_party/webdriver/atoms.cc',
         '../third_party/webdriver/atoms.h',
@@ skipping 80 matching lines @@
     {
       'target_name': 'chromedriver_unittests',
       'type': 'executable',
       'dependencies': [
         'chromedriver_lib',
         '../base/base.gyp:base',
         '../base/base.gyp:run_all_unittests',
         '../net/net.gyp:http_server',
         '../net/net.gyp:net',
         '../testing/gtest.gyp:gtest',
-        '../ui/gfx/gfx.gyp:gfx',
         '../ui/ui.gyp:ui',
       ],
       'include_dirs': [
         '..,'
       ],
       'sources': [
         '<@(chromedriver_unittest_sources)',
       ],
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [ 4267, ],
     },
     # TODO(kkania): Remove when infra no longer references this.
     {
       'target_name': 'chromedriver2_unittests',
       'type': 'executable',
       'dependencies': [
         'chromedriver_lib',
         '../base/base.gyp:base',
         '../base/base.gyp:run_all_unittests',
         '../net/net.gyp:http_server',
         '../net/net.gyp:net',
         '../testing/gtest.gyp:gtest',
-        '../ui/gfx/gfx.gyp:gfx',
         '../ui/ui.gyp:ui',
       ],
       'include_dirs': [
         '..,'
       ],
       'sources': [
         '<@(chromedriver_unittest_sources)',
       ],
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [ 4267, ],
@@ skipping 2344 matching lines @@
             'utility',
           ],
           'sources': [
             'tools/service_discovery_sniffer/service_discovery_sniffer.h',
             'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
           ],
         }]
     }],
   ],  # 'conditions'
 }