Enable content component (again!).

webkit/appcache/webkit_appcache.gypi

Index: webkit/appcache/webkit_appcache.gypi
diff --git a/webkit/appcache/webkit_appcache.gypi b/webkit/appcache/webkit_appcache.gypi
index c3ad2d38035273b570e9ac48ac9057074adf1ab1..3d88488544413d6aabcf7320e2592ec7c595720c 100644
--- a/webkit/appcache/webkit_appcache.gypi
+++ b/webkit/appcache/webkit_appcache.gypi
@@ -7,9 +7,6 @@
     {
       'target_name': 'appcache',
       'variables': { 'enable_wexit_time_destructors': 1, },
-      # TODO(dpranke): Uncomment '<(component)',
-      # 'type': '<(component)',
-      'type': 'static_library',
       'defines': [
         'APPCACHE_IMPLEMENTATION',
       ],
@@ -20,7 +17,6 @@
         '<(DEPTH)/net/net.gyp:net',
         '<(DEPTH)/sql/sql.gyp:sql',
         '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        # TODO(dpranke): Uncomment '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
       ],
       'sources': [
         # This list contains all .h and .cc in appcache except for test code.
@@ -74,6 +70,17 @@
         'webkit_appcache.gypi',
       ],
       'conditions': [
+        [# TODO(dpranke): Remove once the circular dependencies in
+         # WebKit.gyp are fixed on the mac.
+         # See https://bugs.webkit.org/show_bug.cgi?id=68463
+         'OS=="mac"', {
+          'type': 'static_library',
+         }, {
+          'type': '<(component)',
+          'dependencies': [
+              '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
+          ],
+         }],
         ['inside_chromium_build==0', {
           'dependencies': [
             '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',