Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

sync/engine/download_updates_command_unittest.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.
 
 #include "sync/engine/download_updates_command.h"
 #include "sync/protocol/autofill_specifics.pb.h"
 #include "sync/protocol/bookmark_specifics.pb.h"
 #include "sync/protocol/preference_specifics.pb.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/test/engine/fake_model_worker.h"
@@ skipping 21 matching lines @@
     (*mutable_routing_info())[PREFERENCES] = GROUP_UI;
     SyncerCommandTest::SetUp();
   }
 
   DownloadUpdatesCommand command_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DownloadUpdatesCommandTest);
 };
 
-TEST_F(DownloadUpdatesCommandTest, ExecuteNoPayloads) {
+TEST_F(DownloadUpdatesCommandTest, ExecuteNoStates) {
   ConfigureMockServerConnection();
   mock_server()->ExpectGetUpdatesRequestTypes(
       GetRoutingInfoTypes(routing_info()));
   command_.ExecuteImpl(session());
 }
 
-TEST_F(DownloadUpdatesCommandTest, ExecuteWithPayloads) {
+TEST_F(DownloadUpdatesCommandTest, ExecuteWithStates) {
   ConfigureMockServerConnection();
   sessions::SyncSourceInfo source;
-  source.types[AUTOFILL] = "autofill_payload";
-  source.types[BOOKMARKS] = "bookmark_payload";
-  source.types[PREFERENCES] = "preferences_payload";
+  source.types[AUTOFILL].payload = "autofill_payload";
+  source.types[BOOKMARKS].payload = "bookmark_payload";
+  source.types[PREFERENCES].payload = "preferences_payload";
   mock_server()->ExpectGetUpdatesRequestTypes(
       GetRoutingInfoTypes(routing_info()));
-  mock_server()->ExpectGetUpdatesRequestPayloads(source.types);
+  mock_server()->ExpectGetUpdatesRequestStates(source.types);
   command_.ExecuteImpl(session(source));
 }
 
 TEST_F(DownloadUpdatesCommandTest, VerifyAppendDebugInfo) {
   sync_pb::DebugInfo debug_info;
   EXPECT_CALL(*(mock_debug_info_getter()), GetAndClearDebugInfo(_))
       .Times(1);
   command_.AppendClientDebugInfoIfNeeded(session(), &debug_info);
 
   // Now try to add it once more and make sure |GetAndClearDebugInfo| is not
   // called.
   command_.AppendClientDebugInfoIfNeeded(session(), &debug_info);
 }
 
 }  // namespace syncer