sync: Process client commands on commit response

sync/test/engine/mock_connection_manager.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // Mock ServerConnectionManager class for use in client unit tests.
 
 #ifndef SYNC_TEST_ENGINE_MOCK_CONNECTION_MANAGER_H_
 #define SYNC_TEST_ENGINE_MOCK_CONNECTION_MANAGER_H_
 
 #include <bitset>
@@ skipping 111 matching lines @@
   void FailNextPostBufferToPathCall() { countdown_to_postbuffer_fail_ = 1; }
   void FailNthPostBufferToPathCall(int n) { countdown_to_postbuffer_fail_ = n; }
 
   void SetKeystoreKey(const std::string& key);
 
   void FailNonPeriodicGetUpdates() { fail_non_periodic_get_updates_ = true; }
 
   // 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_;
   }
   const std::vector<sync_pb::CommitMessage*>& commit_messages() const {
     return commit_messages_.get();
   }
   const std::vector<sync_pb::CommitResponse*>& commit_responses() const {
     return commit_responses_.get();
   }
@@ skipping 176 matching lines @@
   // Whether we are failing all requests by returning
   // ClientToServerResponse::AUTH_INVALID.
   // Protected by |response_code_override_lock_|.
   bool fail_with_auth_invalid_;
 
   base::Lock response_code_override_lock_;
 
   // 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_;
 
   // The default is to use the newer sync_pb::BookmarkSpecifics-style protocol.
   // If this option is set to true, then the MockConnectionManager will
   // use the older sync_pb::SyncEntity_BookmarkData-style protocol.
   bool use_legacy_bookmarks_protocol_;
 
   ModelTypeSet expected_filter_;
 
   ModelTypeStateMap expected_states_;
 
   int num_get_updates_requests_;
 
   std::string next_token_;
 
   sync_pb::ClientToServerMessage last_request_;
 
   DISALLOW_COPY_AND_ASSIGN(MockConnectionManager);
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_TEST_ENGINE_MOCK_CONNECTION_MANAGER_H_