Merge revision 1485 changes:

- Linux: Fix clang compile errors.

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

cef.gypi

@@ -4,6 +4,8 @@
 
 {
   'variables': {
+    # Don't use the chrome style plugin with CEF.
+    'clang_use_chrome_plugins': 0,
     'conditions': [
       # Directory for CEF source files.
       [ 'OS=="win"', {
@@ -15,10 +17,6 @@
       }, { # OS!="win"
         'cef_directory' : '<!(echo $CEF_DIRECTORY)',
       }],
-      [ 'OS=="mac"', {
-        # Don't use the chrome style plugin with CEF.
-        'clang_use_chrome_plugins': 0,
-      }],
     ]
   }, 'conditions': [
     ['os_posix==1 and OS!="mac" and OS!="android"', {