Merge 144323

Source/WebKit/chromium/WebKit.gyp

 #
 # Copyright (C) 2011 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #         * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #         * Redistributions in binary form must reproduce the above
@@ skipping 635 matching lines @@
                             'sources': [
                                 '<@(webkit_unittest_files)',
                                 'src/WebTestingSupport.cpp',
                                 'public/WebTestingSupport.h',
                                 'tests/WebUnitTests.cpp',   # Components test runner support.
                             ],
                             'sources!': [
                                 # We should not include files depending on webkit_support.
                                 # These tests depend on webkit_support and
                                 # functions defined only in !WEBKIT_IMPLEMENTATION.
+                                'tests/IDBCleanupOnIOErrorTest.cpp',
                                 'tests/LevelDBTest.cpp',
                             ],
                             'conditions': [
                                 ['OS=="win" or OS=="mac"', {
                                     'dependencies': [
                                         '<(chromium_src_dir)/third_party/nss/nss.gyp:*',
                                     ],
                                 }],
                                 ['clang==1', {
                                     # FIXME: It would be nice to enable this in shared builds too,
@@ skipping 610 matching lines @@
         ['clang==1', {
             'target_defaults': {
                 'cflags': ['-Wglobal-constructors'],
                 'xcode_settings': {
                     'WARNING_CFLAGS': ['-Wglobal-constructors'],
                 },
             },
         }],
     ], # conditions
 }