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

Unified Diff: sync/test/engine/mock_connection_manager.h

Issue 10909160: sync: Process client commands on commit response (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Inline client command processing Created 8 years, 3 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 | « sync/engine/syncer_unittest.cc ('k') | sync/test/engine/mock_connection_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/test/engine/mock_connection_manager.h
diff --git a/sync/test/engine/mock_connection_manager.h b/sync/test/engine/mock_connection_manager.h
index 7c5271cbc76947e3a81d05446b2fc257db9b62b3..617e39da348478c67b2ec88519c8a0b185ffa44a 100644
--- a/sync/test/engine/mock_connection_manager.h
+++ b/sync/test/engine/mock_connection_manager.h
@@ -129,7 +129,9 @@ class MockConnectionManager : public ServerConnectionManager {
// Simple inspectors.
bool client_stuck() const { return client_stuck_; }
- sync_pb::ClientCommand* GetNextClientCommand();
+ // warning: These take ownership of their input.
+ void SetGUClientCommand(sync_pb::ClientCommand* command);
+ void SetCommitClientCommand(sync_pb::ClientCommand* command);
const std::vector<syncable::Id>& committed_ids() const {
return committed_ids_;
@@ -326,7 +328,8 @@ class MockConnectionManager : public ServerConnectionManager {
// True if we are only accepting GetUpdatesCallerInfo::PERIODIC requests.
bool fail_non_periodic_get_updates_;
- scoped_ptr<sync_pb::ClientCommand> client_command_;
+ scoped_ptr<sync_pb::ClientCommand> gu_client_command_;
+ scoped_ptr<sync_pb::ClientCommand> commit_client_command_;
// The next value to use for the position_in_parent property.
int64 next_position_in_parent_;
« no previous file with comments | « sync/engine/syncer_unittest.cc ('k') | sync/test/engine/mock_connection_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698