diff options
| -rw-r--r-- | base/allocator/allocator_shim.cc | 2 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/base/allocator/allocator_shim.cc b/base/allocator/allocator_shim.cc index 39161d4..3935737 100644 --- a/base/allocator/allocator_shim.cc +++ b/base/allocator/allocator_shim.cc @@ -88,7 +88,7 @@ inline bool call_new_handler(bool nothrow) { } catch (const std::bad_alloc&) { if (!nothrow) throw; - return p; + return true; } #endif // (defined(__GNUC__) && !defined(__EXCEPTIONS)) || (defined(_HAS_EXCEPTIONS) && !_HAS_EXCEPTIONS) } diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 5ecd2ce..3152b6d 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -516,7 +516,13 @@ '../views/views.gyp:views', # run time dependency '../webkit/webkit.gyp:npapi_test_plugin', - '<(allocator_target)', + ], + 'conditions': [ + ['win_use_allocator_shim==1', { + 'dependencies': [ + '<(allocator_target)', + ], + }], ], 'link_settings': { 'libraries': [ |