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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_tests.gypi

Issue 7461109: Allow sync integration tests to operate on multiple datatypes: Typed Urls (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: CR feedback; rebase Created 9 years, 4 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
« no previous file with comments | « chrome/browser/autofill/personal_data_manager.h ('k') | chrome/test/live_sync/autofill_helper.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 2a9f0f7d2b53ca175450356a831242393d26aa04..7ecaca46e650810d3358f2df71529a01f087ba6a 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -3293,8 +3293,6 @@
'test/live_sync/live_sessions_sync_test.h',
'test/live_sync/live_themes_sync_test.cc',
'test/live_sync/live_themes_sync_test.h',
- 'test/live_sync/live_typed_urls_sync_test.cc',
- 'test/live_sync/live_typed_urls_sync_test.h',
'test/live_sync/live_sync_extension_helper.cc',
'test/live_sync/live_sync_extension_helper.h',
'test/live_sync/live_sync_test.cc',
@@ -3306,8 +3304,8 @@
'test/live_sync/multiple_client_bookmarks_sync_test.cc',
'test/live_sync/multiple_client_live_passwords_sync_test.cc',
'test/live_sync/multiple_client_live_sessions_sync_test.cc',
- 'test/live_sync/multiple_client_live_typed_urls_sync_test.cc',
'test/live_sync/multiple_client_preferences_sync_test.cc',
+ 'test/live_sync/multiple_client_typed_urls_sync_test.cc',
'test/live_sync/preferences_helper.cc',
'test/live_sync/preferences_helper.h',
'test/live_sync/single_client_bookmarks_sync_test.cc',
@@ -3316,8 +3314,8 @@
'test/live_sync/single_client_live_passwords_sync_test.cc',
'test/live_sync/single_client_live_sessions_sync_test.cc',
'test/live_sync/single_client_live_themes_sync_test.cc',
- 'test/live_sync/single_client_live_typed_urls_sync_test.cc',
'test/live_sync/single_client_preferences_sync_test.cc',
+ 'test/live_sync/single_client_typed_urls_sync_test.cc',
'test/live_sync/sync_datatype_helper.cc',
'test/live_sync/sync_datatype_helper.h',
'test/live_sync/sync_errors_test.cc',
@@ -3328,8 +3326,10 @@
'test/live_sync/two_client_live_passwords_sync_test.cc',
'test/live_sync/two_client_live_sessions_sync_test.cc',
'test/live_sync/two_client_live_themes_sync_test.cc',
- 'test/live_sync/two_client_live_typed_urls_sync_test.cc',
'test/live_sync/two_client_preferences_sync_test.cc',
+ 'test/live_sync/two_client_typed_urls_sync_test.cc',
+ 'test/live_sync/typed_urls_helper.cc',
+ 'test/live_sync/typed_urls_helper.h',
],
'conditions': [
['toolkit_uses_gtk == 1', {
@@ -3426,8 +3426,6 @@
'test/live_sync/live_passwords_sync_test.h',
'test/live_sync/live_sessions_sync_test.cc',
'test/live_sync/live_sessions_sync_test.h',
- 'test/live_sync/live_typed_urls_sync_test.cc',
- 'test/live_sync/live_typed_urls_sync_test.h',
'test/live_sync/live_sync_extension_helper.cc',
'test/live_sync/live_sync_extension_helper.h',
'test/live_sync/live_sync_test.cc',
@@ -3442,6 +3440,8 @@
'test/live_sync/performance/typed_urls_sync_perf_test.cc',
'test/live_sync/sync_datatype_helper.cc',
'test/live_sync/sync_datatype_helper.h',
+ 'test/live_sync/typed_urls_helper.cc',
+ 'test/live_sync/typed_urls_helper.h',
],
'conditions': [
['toolkit_uses_gtk == 1', {
« no previous file with comments | « chrome/browser/autofill/personal_data_manager.h ('k') | chrome/test/live_sync/autofill_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698