Index: chrome/chrome_tests.gypi |
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi |
index dbf20ddf19f8af90596bf45209d05466b43f55e4..1ef32785cbc6cff2d8e8d34d86b69a79ac501e99 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. |
{ |
@@ -150,8 +150,8 @@ |
'../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_proto', |
'../third_party/icu/icu.gyp:icui18n', |
'../third_party/icu/icu.gyp:icuuc', |
'../third_party/libpng/libpng.gyp:libpng', |
@@ -845,8 +845,8 @@ |
'../net/net.gyp:net', |
'../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_proto', |
'../sync/sync.gyp:test_support_sync_api', |
'../testing/gmock.gyp:gmock', |
'../testing/gtest.gyp:gtest', |
@@ -1636,7 +1636,6 @@ |
'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'], |
'dependencies': [ |
'browser', |
- '../sync/protocol/sync_proto.gyp:sync_proto', |
'chrome_resources.gyp:chrome_resources', |
'chrome_resources.gyp:chrome_strings', |
'chrome_resources.gyp:packed_extra_resources', |
@@ -1649,6 +1648,7 @@ |
'../net/net.gyp:net', |
'../net/net.gyp:net_test_support', |
'../skia/skia.gyp:skia', |
+ '../sync/sync.gyp:sync_proto', |
'../testing/gmock.gyp:gmock', |
'../testing/gtest.gyp:gtest', |
'../third_party/cld/cld.gyp:cld', |
@@ -1938,7 +1938,6 @@ |
'type': 'executable', |
'dependencies': [ |
'browser', |
- '../sync/protocol/sync_proto.gyp:sync_proto', |
'chrome', |
'chrome_resources.gyp:chrome_resources', |
'chrome_resources.gyp:chrome_strings', |
@@ -1953,6 +1952,7 @@ |
'../printing/printing.gyp:printing', |
'../skia/skia.gyp:skia', |
'../sync/sync.gyp:sync_notifier', |
+ '../sync/sync.gyp:sync_proto', |
'../testing/gmock.gyp:gmock', |
'../testing/gtest.gyp:gtest', |
'../third_party/icu/icu.gyp:icui18n', |
@@ -1975,8 +1975,6 @@ |
'app/chrome_dll.rc', |
'app/chrome_dll_resource.h', |
'app/chrome_version.rc.version', |
- 'browser/sessions/session_backend.cc', |
- 'browser/sync/glue/session_model_associator.cc', |
'test/base/chrome_test_launcher.cc', |
'test/data/resource.rc', |
'browser/sync/test/integration/apps_helper.cc', |
@@ -2107,13 +2105,13 @@ |
'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_proto', |
'../testing/gmock.gyp:gmock', |
'../testing/gtest.gyp:gtest', |
], |
@@ -2130,8 +2128,6 @@ |
'app/chrome_dll.rc', |
'app/chrome_dll_resource.h', |
'app/chrome_version.rc.version', |
- 'browser/sessions/session_backend.cc', |
- 'browser/sync/glue/session_model_associator.cc', |
'browser/sync/test/integration/autofill_helper.cc', |
'browser/sync/test/integration/autofill_helper.h', |
'browser/sync/test/integration/bookmarks_helper.cc', |
@@ -2409,7 +2405,7 @@ |
'test_support_common', |
'browser', |
'renderer', |
- 'chrome_resources.gyp:packed_resources', |
+ 'chrome_resources.gyp:packed_resources', |
'../base/base.gyp:base', |
'../net/net.gyp:net_test_support', |
'../skia/skia.gyp:skia', |