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

Unified Diff: chrome/chrome_tests.gypi

Issue 709683004: components: add wifi_sync component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@submit-1-security-class
Patch Set: fix android_aosp build Created 6 years 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
« no previous file with comments | « chrome/chrome_browser_chromeos.gypi ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index b5bc231fd1d99f440f0d2b49c7c69ff1bae261fe..91f56bbbde2fad22b81590f5934bc593ceee5a26 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1252,6 +1252,7 @@
'browser/sync/test/integration/single_client_supervised_user_settings_sync_test.cc',
'browser/sync/test/integration/single_client_themes_sync_test.cc',
'browser/sync/test/integration/single_client_typed_urls_sync_test.cc',
+ 'browser/sync/test/integration/single_client_wifi_credentials_sync_test.cc',
'browser/sync/test/integration/sync_auth_test.cc',
'browser/sync/test/integration/sync_errors_test.cc',
'browser/sync/test/integration/sync_exponential_backoff_test.cc',
@@ -1268,6 +1269,7 @@
'browser/sync/test/integration/two_client_sessions_sync_test.cc',
'browser/sync/test/integration/two_client_themes_sync_test.cc',
'browser/sync/test/integration/two_client_typed_urls_sync_test.cc',
+ 'browser/sync/test/integration/two_client_wifi_credentials_sync_test.cc',
],
'test_support_sync_integration_sources': [
'browser/sync/test/integration/apps_helper.cc',
@@ -1332,6 +1334,10 @@
'browser/sync/test/integration/typed_urls_helper.h',
'browser/sync/test/integration/updated_progress_marker_checker.cc',
'browser/sync/test/integration/updated_progress_marker_checker.h',
+ 'browser/sync/test/integration/wifi_credentials_helper.cc',
+ 'browser/sync/test/integration/wifi_credentials_helper.h',
+ 'browser/sync/test/integration/wifi_credentials_helper_chromeos.cc',
+ 'browser/sync/test/integration/wifi_credentials_helper_chromeos.h',
],
'sync_performance_tests_sources': [
'app/chrome_command_ids.h',
@@ -2633,6 +2639,15 @@
'browser/sync/test/integration/dictionary_load_observer.h',
],
}],
+ ['chromeos==0', {
+ # Note: this list is duplicated in the GN build.
+ 'sources!': [
+ 'browser/sync/test/integration/wifi_credentials_helper.cc',
+ 'browser/sync/test/integration/wifi_credentials_helper.h',
+ # 'browser/sync/test/integration/wifi_credentials_helper_chromeos.cc',
+ # 'browser/sync/test/integration/wifi_credentials_helper_chromeos.h',
+ ],
+ }],
['enable_app_list==0', {
# Note: this list is duplicated in the GN build.
'sources!': [
@@ -2740,6 +2755,13 @@
'../ui/views/views.gyp:views',
],
}],
+ ['chromeos == 0', {
+ 'sources!': [
+ # Note: this list is duplicated in the GN build.
+ 'browser/sync/test/integration/single_client_wifi_credentials_sync_test.cc',
+ 'browser/sync/test/integration/two_client_wifi_credentials_sync_test.cc',
+ ],
+ }],
['enable_basic_printing==1 or enable_print_preview==1', {
'dependencies': [
'../printing/printing.gyp:printing',
« no previous file with comments | « chrome/chrome_browser_chromeos.gypi ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698