| Index: chrome/chrome_tests.gypi
|
| diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
|
| index 6f3aa4a173e6fdc16f97c8cb82664fcefc715043..4c6fcc3af4b5d0a158da396b9905c974d09aa3e9 100644
|
| --- a/chrome/chrome_tests.gypi
|
| +++ b/chrome/chrome_tests.gypi
|
| @@ -1832,13 +1832,6 @@
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc',
|
| ],
|
| - 'conditions': [
|
| - ['win_use_allocator_shim==1', {
|
| - 'dependencies': [
|
| - '../base/allocator/allocator.gyp:allocator',
|
| - ],
|
| - }],
|
| - ],
|
| 'msvs_settings': {
|
| 'VCLinkerTool': {
|
| 'conditions': [
|
| @@ -2422,13 +2415,6 @@
|
| 'dependencies': [
|
| 'chrome_version_resources',
|
| ],
|
| - 'conditions': [
|
| - ['win_use_allocator_shim==1', {
|
| - 'dependencies': [
|
| - '<(allocator_target)',
|
| - ],
|
| - }],
|
| - ],
|
| }, { # else: OS != "win"
|
| 'sources!': [
|
| 'app/chrome_command_ids.h',
|
| @@ -2527,15 +2513,6 @@
|
| 'browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_browsertest.cc',
|
| ],
|
| }],
|
| - ['os_posix == 1 and OS != "mac" and OS != "android"', {
|
| - 'conditions': [
|
| - ['use_allocator!="none"', {
|
| - 'dependencies': [
|
| - '../base/allocator/allocator.gyp:allocator',
|
| - ],
|
| - }],
|
| - ],
|
| - }],
|
| ['chromeos == 1', {
|
| 'sources': [
|
| 'browser/extensions/api/networking_private/networking_private_apitest.cc',
|
| @@ -2752,13 +2729,6 @@
|
| 'dependencies': [
|
| 'chrome_version_resources',
|
| ],
|
| - 'conditions': [
|
| - ['win_use_allocator_shim==1', {
|
| - 'dependencies': [
|
| - '<(allocator_target)',
|
| - ],
|
| - }],
|
| - ],
|
| 'configurations': {
|
| 'Debug_Base': {
|
| 'msvs_settings': {
|
| @@ -2807,20 +2777,6 @@
|
| 'test/perf/mach_ports_performancetest.cc',
|
| ],
|
| }],
|
| - ['os_posix == 1 and OS != "mac" and OS != "android"', {
|
| - 'conditions': [
|
| - ['use_allocator!="none"', {
|
| - 'dependencies': [
|
| - '../base/allocator/allocator.gyp:allocator',
|
| - ],
|
| - }],
|
| - ],
|
| - }],
|
| - ['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', {
|
| - 'dependencies': [
|
| - '<(DEPTH)/base/allocator/allocator.gyp:allocator',
|
| - ],
|
| - }],
|
| ], # conditions
|
| }, # target performance_browser_tests
|
| {
|
| @@ -2957,13 +2913,6 @@
|
| 'dependencies': [
|
| 'chrome_version_resources',
|
| ],
|
| - 'conditions': [
|
| - ['win_use_allocator_shim==1', {
|
| - 'dependencies': [
|
| - '<(allocator_target)',
|
| - ],
|
| - }],
|
| - ],
|
| 'configurations': {
|
| 'Debug': {
|
| 'msvs_settings': {
|
| @@ -3064,13 +3013,6 @@
|
| 'dependencies': [
|
| 'chrome_version_resources',
|
| ],
|
| - 'conditions': [
|
| - ['win_use_allocator_shim==1', {
|
| - 'dependencies': [
|
| - '<(allocator_target)',
|
| - ],
|
| - }],
|
| - ],
|
| 'configurations': {
|
| 'Debug': {
|
| 'msvs_settings': {
|
|
|