diff options
author | skrul@chromium.org <skrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-26 22:02:38 +0000 |
---|---|---|
committer | skrul@chromium.org <skrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-26 22:02:38 +0000 |
commit | e3e43d92c57ab8524e9a847ba779d8cbc51fdd54 (patch) | |
tree | 49933ab2440ed0ed6ca5a2ee08d7b5675ae25613 /chrome/chrome_tests.gypi | |
parent | eafc0b45422fd004cbe5ca652eb5dd36a86b1c31 (diff) | |
download | chromium_src-e3e43d92c57ab8524e9a847ba779d8cbc51fdd54.zip chromium_src-e3e43d92c57ab8524e9a847ba779d8cbc51fdd54.tar.gz chromium_src-e3e43d92c57ab8524e9a847ba779d8cbc51fdd54.tar.bz2 |
Un-reverting 33964 - turns out the problem here was that I used DCHECKs with mocked methods in it, and in release mode my expectations no longer matched. See added #ifdef in data_type_manager_impl_unittest.cc.
Review URL: http://codereview.chromium.org/661111
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40164 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
-rw-r--r-- | chrome/chrome_tests.gypi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index d58a8d6..70cd9db 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -827,6 +827,8 @@ 'browser/ssl/ssl_host_state_unittest.cc', 'browser/sync/glue/change_processor_mock.h', 'browser/sync/glue/data_type_controller_mock.h', + 'browser/sync/glue/data_type_manager_impl_unittest.cc', + 'browser/sync/glue/data_type_manager_mock.h', 'browser/sync/glue/database_model_worker_unittest.cc', 'browser/sync/glue/http_bridge_unittest.cc', 'browser/sync/glue/ui_model_worker_unittest.cc', |