Revert 109534 since this change broke clobbered component build.

content/content.gyp

 # Copyright (c) 2011 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,  # Use higher warning level.
     'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/directxsdk)',
   },
   'includes': [
     '../build/win_precompile.gypi',
     'content_shell.gypi',
     'content_tests.gypi',
   ],
   'target_defaults': {
     'defines': ['CONTENT_IMPLEMENTATION'],
   },
   'conditions': [
    # In component mode, we build all of content as a single DLL.
    # However, in the static mode, we need to build content as multiple
    # targets in order to prevent dependencies from getting introduced
    # upstream unnecessarily (e.g., content_renderer depends on allocator
    # and chrome_exe depends on content_common but we don't want
    # chrome_exe to have to depend on allocator).
-   #
-   # TODO(dpranke): Remove the mac conditional once the circular
-   # dependencies in WebKit.gyp are fixed.
-   # See https://bugs.webkit.org/show_bug.cgi?id=68463
-   ['OS == "mac" or component == "static_library"', {
+   # TODO(dpranke): Uncomment: ['component == "static_library"', {
+   ['1 == 1', {
      'targets': [
       {'target_name': 'content',
        'type': 'none',
        'dependencies': [
         'content_app',
         'content_browser',
         'content_common',
         'content_gpu',
         'content_plugin',
         'content_ppapi_plugin',
@@ skipping 204 matching lines @@
       },
       {'target_name': 'content_worker',
        'type': 'none',
        'dependencies': ['content'],
       },
      ],
     },
    ],
   ],
 }