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

Unified Diff: chrome/browser/sync/profile_sync_service_password_unittest.cc

Issue 6111012: sync: avoid creating a HistoryModelWorker unless it is needed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/chrome
Patch Set: fix test Created 9 years, 11 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/sync/glue/sync_backend_host.cc ('k') | chrome/browser/sync/test_profile_sync_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/profile_sync_service_password_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_password_unittest.cc b/chrome/browser/sync/profile_sync_service_password_unittest.cc
index dfb172b0fe1ad120e35dbcb23e2068a245fb708f..899b40c9c6310dae12ba23e90c2ef735172598e5 100644
--- a/chrome/browser/sync/profile_sync_service_password_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_password_unittest.cc
@@ -166,13 +166,6 @@ class ProfileSyncServicePasswordTest : public AbstractProfileSyncServiceTest {
EXPECT_CALL(profile_, GetTokenService()).
WillRepeatedly(Return(&token_service_));
- // Creating model safe workers will request the history service and
- // password store. I couldn't manage to convince gmock that splitting up
- // the expectations to match the class responsibilities was a good thing,
- // so we set them all together here.
- EXPECT_CALL(profile_, GetHistoryService(_)).
- WillOnce(Return(static_cast<HistoryService*>(NULL)));
-
EXPECT_CALL(profile_, GetPasswordStore(_)).
Times(2).
WillRepeatedly(Return(password_store_.get()));
« no previous file with comments | « chrome/browser/sync/glue/sync_backend_host.cc ('k') | chrome/browser/sync/test_profile_sync_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698