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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sync/test_profile_sync_service.h

Issue 10689185: Revert 146262 - Revert "Revert 142517 - [Sync] Refactor sync configuration logic." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 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.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/test_profile_sync_service.h
===================================================================
--- chrome/browser/sync/test_profile_sync_service.h (revision 146499)
+++ chrome/browser/sync/test_profile_sync_service.h (working copy)
@@ -44,13 +44,12 @@
MOCK_METHOD1(RequestNudge, void(const tracked_objects::Location&));
- virtual void RequestConfigureSyncer(
- syncer::ConfigureReason reason,
- syncer::ModelTypeSet types_to_config,
- const syncer::ModelSafeRoutingInfo& routing_info,
- const base::Callback<void(syncer::ModelTypeSet)>& ready_task,
- const base::Closure& retry_callback) OVERRIDE;
+ // Called when a nudge comes in.
+ void SimulateSyncCycleCompletedInitialSyncEnded(
+ const tracked_objects::Location&);
+ virtual void StartConfiguration(const base::Closure& callback) OVERRIDE;
+
static void SetHistoryServiceExpectations(ProfileMock* profile);
protected:
« no previous file with comments | « chrome/browser/sync/glue/sync_backend_host.cc ('k') | chrome/browser/sync/test_profile_sync_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698