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

Unified Diff: chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc

Issue 8312001: Revert 105668 - When StartFailed for a datatype the fix is to call StopAssociation which would ca... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 2 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/non_frontend_data_type_controller.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc
===================================================================
--- chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc (revision 105673)
+++ chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc (working copy)
@@ -118,7 +118,7 @@
EXPECT_CALL(profile_, GetProfileSyncService()).WillRepeatedly(
Return(&service_));
db_thread_.Start();
- profile_sync_factory_.reset(new StrictMock<ProfileSyncFactoryMock>());
+ profile_sync_factory_.reset(new ProfileSyncFactoryMock());
// Both of these are refcounted, so don't need to be released.
dtc_mock_ = new StrictMock<NonFrontendDataTypeControllerMock>();
« no previous file with comments | « chrome/browser/sync/glue/non_frontend_data_type_controller.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698