Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

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 390 matching lines @@
 
   // Verify that the GetUpdates filter sent by the Syncer matches the test
   // expectation.
   for (int i = FIRST_REAL_MODEL_TYPE; i < MODEL_TYPE_COUNT; ++i) {
     ModelType model_type = ModelTypeFromInt(i);
     sync_pb::DataTypeProgressMarker const* progress_marker =
         GetProgressMarkerForType(gu.from_progress_marker(), model_type);
     EXPECT_EQ(expected_filter_.Has(model_type), (progress_marker != NULL))
         << "Syncer requested_types differs from test expectation.";
     if (progress_marker) {
-      EXPECT_EQ((expected_payloads_.count(model_type) > 0 ?
-                 expected_payloads_[model_type] :
+      EXPECT_EQ((expected_states_.count(model_type) > 0 ?
+                 expected_states_[model_type].payload :
                  std::string()),
                 progress_marker->notification_hint());
     }
   }
 
   // Verify that the items we're about to send back to the client are of
   // the types requested by the client.  If this fails, it probably indicates
   // a test bug.
   EXPECT_TRUE(gu.fetch_folders());
   EXPECT_FALSE(gu.has_requested_types());
@@ skipping 176 matching lines @@
 
 void MockConnectionManager::UpdateConnectionStatus() {
   if (!server_reachable_) {
     server_status_ = HttpResponse::CONNECTION_UNAVAILABLE;
   } else {
     server_status_ = HttpResponse::SERVER_CONNECTION_OK;
   }
 }
 
 }  // namespace syncer