Index: chrome/chrome_tests.gypi |
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi |
index f74c91610b7274477dedd1167b1c4ce5e4e2d31e..298846e0622c828f082a3d416dfb470a83782983 100644 |
--- a/chrome/chrome_tests.gypi |
+++ b/chrome/chrome_tests.gypi |
@@ -1,4 +1,4 @@ |
-# Copyright (c) 2012 The Chromium Authors. All rights reserved. |
+# Copyright 2012 The Chromium Authors. All rights reserved. |
# Use of this source code is governed by a BSD-style license that can be |
# found in the LICENSE file. |
{ |
@@ -135,6 +135,7 @@ |
'type': 'executable', |
'dependencies': [ |
'browser', |
+ 'chrome', |
Ryan Sleevi
2012/12/07 03:16:31
BUG: You shouldn't be re-introducing this dependen
Raghu Simha
2012/12/07 06:08:33
I recall there being a merge conflict right about
|
'chrome_resources.gyp:chrome_resources', |
'chrome_resources.gyp:chrome_strings', |
'common/extensions/api/api.gyp:api', |
@@ -148,8 +149,7 @@ |
'../net/net.gyp:net_resources', |
'../net/net.gyp:net_test_support', |
'../skia/skia.gyp:skia', |
- '../sync/protocol/sync_proto.gyp:sync_proto', |
- '../sync/sync.gyp:sync_api', |
+ '../sync/sync.gyp:sync', |
'../third_party/icu/icu.gyp:icui18n', |
'../third_party/icu/icu.gyp:icuuc', |
'../third_party/libpng/libpng.gyp:libpng', |
@@ -226,7 +226,7 @@ |
'test/base/interactive_test_utils_aura.cc', |
'test/base/interactive_test_utils_aura.h', |
'test/base/interactive_test_utils_gtk.cc', |
- 'test/base/interactive_test_utils_mac.mm', |
+ 'test/base/interactive_test_utils_mac.mm', |
'test/base/interactive_test_utils_views.cc', |
'test/base/interactive_test_utils_win.cc', |
'test/base/view_event_test_base.cc', |
@@ -434,7 +434,7 @@ |
'../build/temp_gyp/googleurl.gyp:googleurl', |
'../net/net.gyp:net', |
'../skia/skia.gyp:skia', |
- '../sync/sync.gyp:sync_api', |
+ '../sync/sync.gyp:sync', |
'../testing/gtest.gyp:gtest', |
'../third_party/icu/icu.gyp:icui18n', |
'../third_party/icu/icu.gyp:icuuc', |
@@ -799,7 +799,7 @@ |
'../net/net.gyp:net_test_support', |
'../skia/skia.gyp:skia', |
'../sync/protocol/sync_proto.gyp:sync_proto', |
- '../sync/sync.gyp:sync_notifier', |
+ '../sync/sync.gyp:sync', |
'../sync/sync.gyp:test_support_sync_api', |
'../testing/gmock.gyp:gmock', |
'../testing/gtest.gyp:gtest', |
@@ -1961,7 +1961,6 @@ |
'type': 'executable', |
'dependencies': [ |
'browser', |
- '../sync/protocol/sync_proto.gyp:sync_proto', |
'chrome', |
'chrome_resources.gyp:chrome_resources', |
'chrome_resources.gyp:chrome_strings', |
@@ -1975,7 +1974,7 @@ |
'../net/net.gyp:net_test_support', |
'../printing/printing.gyp:printing', |
'../skia/skia.gyp:skia', |
- '../sync/sync.gyp:sync_notifier', |
+ '../sync/sync.gyp:sync', |
'../testing/gmock.gyp:gmock', |
'../testing/gtest.gyp:gtest', |
'../third_party/icu/icu.gyp:icui18n', |
@@ -2130,13 +2129,12 @@ |
'target_name': 'sync_performance_tests', |
'type': 'executable', |
'dependencies': [ |
- '../sync/protocol/sync_proto.gyp:sync_proto', |
'browser', |
'chrome', |
'common/extensions/api/api.gyp:api', |
'test_support_common', |
'../skia/skia.gyp:skia', |
- '../sync/sync.gyp:sync_notifier', |
+ '../sync/sync.gyp:sync', |
'../testing/gmock.gyp:gmock', |
'../testing/gtest.gyp:gtest', |
], |
@@ -2419,7 +2417,7 @@ |
'../base/base.gyp:base', |
'../net/net.gyp:net_test_support', |
'../skia/skia.gyp:skia', |
- '../sync/sync.gyp:sync_api', |
+ '../sync/sync.gyp:sync', |
], |
'include_dirs': [ |
'..', |
@@ -2482,7 +2480,7 @@ |
'debugger', |
'test_support_common', |
'../skia/skia.gyp:skia', |
- '../sync/sync.gyp:sync_api', |
+ '../sync/sync.gyp:sync', |
'../testing/gtest.gyp:gtest', |
], |
'export_dependent_settings': [ |
@@ -2714,7 +2712,7 @@ |
# Win bot needs to be turned into an interactive bot. |
'interactive_ui_tests', |
# Disabled from running in coverage_posix.py. |
- # We need to build this during compile step, so enabling here. |
+ # We need to build this during compile step, so enabling here. |
'browser_tests', |
'../courgette/courgette.gyp:courgette_unittests', |
'../crypto/crypto.gyp:crypto_unittests', |