Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1744)

Unified Diff: chrome/chrome_tests.gypi

Issue 12096116: Enable dictionary sync by default (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Merge master Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 010ec684647e292cbb54d4aacd1bc1b8b0c833b9..970b458262176c6d0f07af62a4f414783bbb5259 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2234,6 +2234,16 @@
# The sync_integration_tests do not run on mac without this flag.
# Search for comments about "xcode_settings" elsewhere in this file.
'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
+ # Dictionary sync is disabled on Mac.
+ 'sources!': [
+ 'browser/sync/test/integration/dictionary_helper.cc',
+ 'browser/sync/test/integration/dictionary_helper.h',
+ 'browser/sync/test/integration/dictionary_load_observer.cc',
+ 'browser/sync/test/integration/dictionary_load_observer.h',
+ 'browser/sync/test/integration/multiple_client_dictionary_sync_test.cc',
+ 'browser/sync/test/integration/single_client_dictionary_sync_test.cc',
+ 'browser/sync/test/integration/two_client_dictionary_sync_test.cc',
+ ],
}],
['OS=="win"', {
'sources': [
@@ -2359,6 +2369,14 @@
# The sync_performance_tests do not run on mac without this flag.
# Search for comments about "xcode_settings" elsewhere in this file.
'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
+ # Dictionary sync is disabled on Mac.
+ 'sources!': [
+ 'browser/sync/test/integration/dictionary_helper.cc',
+ 'browser/sync/test/integration/dictionary_helper.h',
+ 'browser/sync/test/integration/dictionary_load_observer.cc',
+ 'browser/sync/test/integration/dictionary_load_observer.h',
+ 'browser/sync/test/integration/performance/dictionary_sync_perf_test.cc',
+ ],
}],
['OS=="win"', {
'sources': [
« no previous file with comments | « chrome/browser/sync/test/integration/two_client_dictionary_sync_test.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698