sync: Process client commands on commit response

sync/test/engine/mock_connection_manager.cc

 // 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 regression tests.
 
 #include "sync/test/engine/mock_connection_manager.h"
 
 #include <map>
 
@@ skipping 30 matching lines @@
       store_birthday_("Store BDay!"),
       store_birthday_sent_(false),
       client_stuck_(false),
       commit_time_rename_prepended_string_(""),
       countdown_to_postbuffer_fail_(0),
       directory_(directory),
       mid_commit_observer_(NULL),
       throttling_(false),
       fail_with_auth_invalid_(false),
       fail_non_periodic_get_updates_(false),
-      client_command_(NULL),
+      gu_client_command_(NULL),
+      commit_client_command_(NULL),
       next_position_in_parent_(2),
       use_legacy_bookmarks_protocol_(false),
       num_get_updates_requests_(0) {
   SetNewTimestamp(0);
   set_auth_token(kValidAuthToken);
 }
 
 MockConnectionManager::~MockConnectionManager() {
   EXPECT_TRUE(update_queue_.empty()) << "Unfetched updates.";
 }
@@ skipping 74 matching lines @@
   store_birthday_sent_ = true;
 
   if (post.message_contents() == ClientToServerMessage::COMMIT) {
     ProcessCommit(&post, &response);
   } else if (post.message_contents() == ClientToServerMessage::GET_UPDATES) {
     ProcessGetUpdates(&post, &response);
   } else {
     EXPECT_TRUE(false) << "Unknown/unsupported ClientToServerMessage";
     return false;
   }
-  if (client_command_.get()) {
-    response.mutable_client_command()->CopyFrom(*client_command_.get());
-  }
 
   {
     base::AutoLock lock(response_code_override_lock_);
     if (throttling_) {
       response.set_error_code(SyncEnums::THROTTLED);
       throttling_ = false;
     }
 
     if (fail_with_auth_invalid_)
       response.set_error_code(SyncEnums::AUTH_INVALID);
@@ skipping 44 matching lines @@
     string name,
     int64 version,
     int64 sync_ts) {
   return AddUpdateDirectory(TestIdFactory::FromNumber(id),
                             TestIdFactory::FromNumber(parent_id),
                             name,
                             version,
                             sync_ts);
 }
 
-sync_pb::ClientCommand* MockConnectionManager::GetNextClientCommand() {
-  if (!client_command_.get())
-    client_command_.reset(new sync_pb::ClientCommand());
-  return client_command_.get();
+void MockConnectionManager::SetGUClientCommand(
+    sync_pb::ClientCommand* command) {
+  gu_client_command_.reset(command);
+}
+
+void MockConnectionManager::SetCommitClientCommand(
+    sync_pb::ClientCommand* command) {
+  commit_client_command_.reset(command);
 }
 
 sync_pb::SyncEntity* MockConnectionManager::AddUpdateBookmark(
     int id, int parent_id,
     string name, int64 version,
     int64 sync_ts) {
   return AddUpdateBookmark(TestIdFactory::FromNumber(id),
                            TestIdFactory::FromNumber(parent_id),
                            name,
                            version,
@@ skipping 219 matching lines @@
       new_marker->set_data_type_id(gu.from_progress_marker(i).data_type_id());
       new_marker->set_token(token);
     }
   }
 
   // Fill the keystore key if requested.
   if (gu.need_encryption_key())
     response->mutable_get_updates()->set_encryption_key(keystore_key_);
 
   update_queue_.pop_front();
+
+  if (gu_client_command_.get()) {
+    response->mutable_client_command()->CopyFrom(*gu_client_command_.get());
+  }
 }
 
 void MockConnectionManager::SetKeystoreKey(const std::string& key) {
   // Note: this is not a thread-safe set, ok for now.  NOT ok if tests
   // run the syncer on the background thread while this method is called.
   keystore_key_ = key;
 }
 
 bool MockConnectionManager::ShouldConflictThisCommit() {
   bool conflict = false;
@@ skipping 51 matching lines @@
     }
     if (entry.has_version() && 0 != entry.version()) {
       er->set_id_string(id);  // Allows verification.
     } else {
       string new_id = base::StringPrintf("mock_server:%d", next_new_id_++);
       changed_ids[id] = new_id;
       er->set_id_string(new_id);
     }
   }
   commit_responses_.push_back(new CommitResponse(*commit_response));
+
+  if (commit_client_command_.get()) {
+    response_buffer->mutable_client_command()->CopyFrom(
+        *commit_client_command_.get());
+  }
 }
 
 sync_pb::SyncEntity* MockConnectionManager::AddUpdateDirectory(
     syncable::Id id, syncable::Id parent_id, string name, int64 version,
     int64 sync_ts) {
   return AddUpdateDirectory(id.GetServerId(), parent_id.GetServerId(),
                             name, version, sync_ts);
 }
 
 sync_pb::SyncEntity* MockConnectionManager::AddUpdateBookmark(
@@ skipping 62 matching lines @@
 
 void MockConnectionManager::UpdateConnectionStatus() {
   if (!server_reachable_) {
     server_status_ = HttpResponse::CONNECTION_UNAVAILABLE;
   } else {
     server_status_ = HttpResponse::SERVER_CONNECTION_OK;
   }
 }
 
 }  // namespace syncer