Merge revision 992 changes:

- Mac: Remove temporary workaround for an Xcode 4 build error.

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1364@994 5089003a-bbd8-11dd-ad1f-f1f9622dbc98

cef1/cef.gypi

@@ -21,15 +21,6 @@
       }],
     ]
   }, 'conditions': [
-    ['OS=="mac" and clang==1', {
-      'target_defaults': {
-        'xcode_settings': {
-          # Temporary workaround for an Xcode 4 build error. This can be
-          # removed with the next Chromium update. See crbug.com/156530.
-          'WARNING_CFLAGS': ['-Wno-unknown-warning-option'],
-        },
-      },
-    }],
     ['os_posix==1 and OS!="mac" and OS!="android"', {
       'target_defaults': {
         'cflags_cc': ['-Wno-deprecated-declarations'],