diff options
| author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-19 17:52:39 +0000 |
|---|---|---|
| committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-19 17:52:39 +0000 |
| commit | 5cc5211e127095a53b78ed6cbb20b33e6de941e4 (patch) | |
| tree | 8404a73cd27599abce2704d2db6b5712cb5323bd /chrome/chrome_tests.gypi | |
| parent | 502811deb3b111ee53e72c345a13af983a92631d (diff) | |
| download | chromium_src-5cc5211e127095a53b78ed6cbb20b33e6de941e4.zip chromium_src-5cc5211e127095a53b78ed6cbb20b33e6de941e4.tar.gz chromium_src-5cc5211e127095a53b78ed6cbb20b33e6de941e4.tar.bz2 | |
Reland r81454 (sync non-frontend datatype controllers) with longer timeouts.
Original codereview: http://codereview.chromium.org/6811003
BUG=77964
TEST=unit
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=82028
Review URL: http://codereview.chromium.org/6869016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82120 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
| -rw-r--r-- | chrome/chrome_tests.gypi | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 1e502fe..cc68fcb 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1551,6 +1551,9 @@ 'browser/sync/glue/http_bridge_unittest.cc', 'browser/sync/glue/model_associator_mock.cc', 'browser/sync/glue/model_associator_mock.h', + 'browser/sync/glue/non_frontend_data_type_controller_mock.cc', + 'browser/sync/glue/non_frontend_data_type_controller_mock.h', + 'browser/sync/glue/non_frontend_data_type_controller_unittest.cc', 'browser/sync/glue/preference_data_type_controller_unittest.cc', 'browser/sync/glue/preference_model_associator_unittest.cc', 'browser/sync/glue/session_model_associator_unittest.cc', |