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/test/testing_profile.h | |
| 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/test/testing_profile.h')
| -rw-r--r-- | chrome/test/testing_profile.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h index 1cc458b..31711fe 100644 --- a/chrome/test/testing_profile.h +++ b/chrome/test/testing_profile.h @@ -21,6 +21,8 @@ #include "chrome/browser/search_engines/template_url_model.h" #include "net/base/cookie_monster.h" +class ProfileSyncFactory; +class ProfileSyncService; class SessionService; class TestingProfile : public Profile { @@ -268,6 +270,9 @@ class TestingProfile : public Profile { // The BookmarkModel. Only created if CreateBookmarkModel is invoked. scoped_ptr<BookmarkModel> bookmark_bar_model_; + // The ProfileSyncFactory. Created by CreateProfileSyncService. + scoped_ptr<ProfileSyncFactory> profile_sync_factory_; + // The ProfileSyncService. Created by CreateProfileSyncService. scoped_ptr<ProfileSyncService> profile_sync_service_; |