| Index: chrome/chrome_tests_unit.gypi
|
| diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
|
| index 15460b8bce1e5b2f95ddb2b5733e827f220b50b9..df076991182cace9e304baef5983226f00474279 100644
|
| --- a/chrome/chrome_tests_unit.gypi
|
| +++ b/chrome/chrome_tests_unit.gypi
|
| @@ -2604,15 +2604,6 @@
|
| },
|
| },
|
| }],
|
| - ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
|
| - 'conditions': [
|
| - ['use_allocator!="none"', {
|
| - 'dependencies': [
|
| - '../base/allocator/allocator.gyp:allocator',
|
| - ],
|
| - }],
|
| - ],
|
| - }],
|
| ['OS=="mac"', {
|
| # The test fetches resources which means Mac need the app bundle to
|
| # exist on disk so it can pull from it.
|
| @@ -2700,11 +2691,6 @@
|
| '../third_party/isimpledom/isimpledom.gyp:isimpledom',
|
| ],
|
| 'conditions': [
|
| - ['win_use_allocator_shim==1', {
|
| - 'dependencies': [
|
| - '<(allocator_target)',
|
| - ],
|
| - }],
|
| ['branding!="Chrome"', {
|
| 'sources!': [
|
| 'browser/google/google_update_win_unittest.cc',
|
| @@ -2926,13 +2912,6 @@
|
| '../breakpad/breakpad.gyp:*',
|
| '../components/components.gyp:crash_component',
|
| ],
|
| - 'conditions': [
|
| - ['win_use_allocator_shim==1', {
|
| - 'dependencies': [
|
| - '<(allocator_target)',
|
| - ],
|
| - }],
|
| - ],
|
| }],
|
| ],
|
| },
|
|
|