Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

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>
 #include <list>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_vector.h"
 #include "sync/engine/net/server_connection_manager.h"
 #include "sync/internal_api/public/base/model_type.h"
-#include "sync/internal_api/public/base/model_type_payload_map.h"
+#include "sync/internal_api/public/base/model_type_state_map.h"
 #include "sync/protocol/sync.pb.h"
 
 namespace syncer {
 
 class MockConnectionManager : public ServerConnectionManager {
  public:
   class MidCommitObserver {
    public:
     virtual void Observe() = 0;
 
@@ skipping 150 matching lines @@
     num_get_updates_requests_ = 0;
     return result;
   }
 
   // Expect that GetUpdates will request exactly the types indicated in
   // the bitset.
   void ExpectGetUpdatesRequestTypes(ModelTypeSet expected_filter) {
     expected_filter_ = expected_filter;
   }
 
-  void ExpectGetUpdatesRequestPayloads(const ModelTypePayloadMap& payloads) {
-    expected_payloads_ = payloads;
+  void ExpectGetUpdatesRequestStates(const ModelTypeStateMap& states) {
+    expected_states_ = states;
   }
 
   void SetServerReachable();
 
   void SetServerNotReachable();
 
   // Updates our internal state as if we had attempted a connection.  Does not
   // send notifications as a real connection attempt would.  This is useful in
   // cases where we're mocking out most of the code that performs network
   // requests.
@@ skipping 128 matching lines @@
   // 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_;
 
-  ModelTypePayloadMap expected_payloads_;
+  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_