| Index: chrome/chrome_tests.gypi
|
| diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
|
| index 85d17da5030f56daef4259d0a676cf87b772c4ad..2d54dbf1a7afddbe7367ad0ea314b11348bea1cc 100644
|
| --- a/chrome/chrome_tests.gypi
|
| +++ b/chrome/chrome_tests.gypi
|
| @@ -471,7 +471,7 @@
|
| 'type': 'executable',
|
| 'dependencies': [
|
| '../sync/protocol/sync_proto.gyp:sync_proto',
|
| - '../sync/sync.gyp:syncapi_core',
|
| + '../sync/sync.gyp:sync_api',
|
| 'chrome',
|
| 'chrome_resources.gyp:chrome_resources',
|
| 'chrome_resources.gyp:chrome_strings',
|
| @@ -720,7 +720,7 @@
|
| '../build/temp_gyp/googleurl.gyp:googleurl',
|
| '../net/net.gyp:net',
|
| '../skia/skia.gyp:skia',
|
| - '../sync/sync.gyp:syncapi_core',
|
| + '../sync/sync.gyp:sync_api',
|
| '../testing/gtest.gyp:gtest',
|
| '../third_party/icu/icu.gyp:icui18n',
|
| '../third_party/icu/icu.gyp:icuuc',
|
| @@ -1016,10 +1016,10 @@
|
| '../testing/gmock.gyp:gmock',
|
| '../testing/gtest.gyp:gtest',
|
| 'test_support_common',
|
| - '../sync/sync.gyp:test_support_sync',
|
| + '../sync/sync.gyp:test_support_sync_api',
|
| + '../sync/sync.gyp:test_support_sync_core',
|
| + '../sync/sync.gyp:test_support_sync_internal_api',
|
| '../sync/sync.gyp:test_support_sync_notifier',
|
| - '../sync/sync.gyp:test_support_syncapi_core',
|
| - '../sync/sync.gyp:test_support_syncapi_service',
|
| 'test_support_unit',
|
| # 3) anything tests directly depend on
|
| '../google_apis/google_apis.gyp:google_apis',
|
| @@ -2828,7 +2828,8 @@
|
| '../net/net.gyp:net_test_support',
|
| '../skia/skia.gyp:skia',
|
| '../sync/protocol/sync_proto.gyp:sync_proto',
|
| - '../sync/sync.gyp:test_support_syncapi_service',
|
| + '../sync/sync.gyp:sync_notifier',
|
| + '../sync/sync.gyp:test_support_sync_api',
|
| '../testing/gmock.gyp:gmock',
|
| '../testing/gtest.gyp:gtest',
|
| '../third_party/cld/cld.gyp:cld',
|
| @@ -4033,6 +4034,7 @@
|
| '../net/net.gyp:net_test_support',
|
| '../printing/printing.gyp:printing',
|
| '../skia/skia.gyp:skia',
|
| + '../sync/sync.gyp:sync_notifier',
|
| '../testing/gmock.gyp:gmock',
|
| '../testing/gtest.gyp:gtest',
|
| '../third_party/icu/icu.gyp:icui18n',
|
| @@ -4194,6 +4196,7 @@
|
| 'common/extensions/api/api.gyp:api',
|
| 'test_support_common',
|
| '../skia/skia.gyp:skia',
|
| + '../sync/sync.gyp:sync_notifier',
|
| '../testing/gmock.gyp:gmock',
|
| '../testing/gtest.gyp:gtest',
|
| ],
|
| @@ -4476,7 +4479,7 @@
|
| '../base/base.gyp:base',
|
| '../net/net.gyp:net_test_support',
|
| '../skia/skia.gyp:skia',
|
| - '../sync/sync.gyp:syncapi_core',
|
| + '../sync/sync.gyp:sync_api',
|
| ],
|
| 'include_dirs': [
|
| '..',
|
| @@ -4539,7 +4542,7 @@
|
| 'debugger',
|
| 'test_support_common',
|
| '../skia/skia.gyp:skia',
|
| - '../sync/sync.gyp:syncapi_core',
|
| + '../sync/sync.gyp:sync_api',
|
| '../testing/gtest.gyp:gtest',
|
| ],
|
| 'export_dependent_settings': [
|
|
|