| Index: sync/sync_tests.gypi
|
| diff --git a/sync/sync_tests.gypi b/sync/sync_tests.gypi
|
| index c9ec6ede760a54b8f5e17c33a9e30eebcfb7453e..1c0b7ace0a538523ec2f6a4e4df018244705fdc1 100644
|
| --- a/sync/sync_tests.gypi
|
| +++ b/sync/sync_tests.gypi
|
| @@ -354,14 +354,6 @@
|
| 'util/protobuf_unittest.cc',
|
| ],
|
| 'conditions': [
|
| - # TODO(akalin): This is needed because histogram.cc uses
|
| - # leak_annotations.h, which pulls this in. Make 'base'
|
| - # propagate this dependency.
|
| - ['OS=="linux" and use_allocator!="none"', {
|
| - 'dependencies': [
|
| - '../base/allocator/allocator.gyp:allocator',
|
| - ],
|
| - }],
|
| ['OS == "android"', {
|
| 'dependencies': [
|
| '../testing/android/native_test.gyp:native_test_native_code',
|
|
|