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

trunk/src/content/content_shell.gypi

 # Copyright (c) 2012 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': {
     'content_shell_product_name': 'Content Shell',
     # The "19" is so that sites that sniff for version think that this is
     # something reasonably current; the "77.34.5" is a hint that this isn't a
     # standard Chrome.
@@ skipping 29 matching lines @@
         'test_support_content',
         'content_resources.gyp:content_resources',
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../ipc/ipc.gyp:ipc',
         '../media/media.gyp:media',
         '../net/net.gyp:net',
         '../net/net.gyp:net_resources',
         '../skia/skia.gyp:skia',
         '../third_party/WebKit/public/blink_test_runner.gyp:blink_test_runner',
-        '../ui/gfx/gfx.gyp:gfx',
         '../ui/gl/gl.gyp:gl',
         '../ui/ui.gyp:ui',
         '../url/url.gyp:url_lib',
         '../v8/tools/gyp/v8.gyp:v8',
         '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
         '../webkit/common/webkit_common.gyp:webkit_common',
         '../webkit/glue/webkit_glue.gyp:glue',
         '../webkit/webkit_resources.gyp:webkit_resources',
       ],
       'include_dirs': [
@@ skipping 685 matching lines @@
                 '../tools/imagediff/image_diff.gyp:image_diff#host',
               ],
             }],
           ],
           'includes': [ '../build/java_apk.gypi' ],
         },
       ],
     }],  # OS=="android"
   ]
 }