Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

sync/test/engine/syncer_command_test.h

Index: sync/test/engine/syncer_command_test.h
diff --git a/sync/test/engine/syncer_command_test.h b/sync/test/engine/syncer_command_test.h
index 803ef18e4fab0b76b5afc0c90826f692e8cc2e31..8e1aa14c88f22ed8225b6f7d9c199f09f0fc6f9b 100644
--- a/sync/test/engine/syncer_command_test.h
+++ b/sync/test/engine/syncer_command_test.h
@@ -98,10 +98,10 @@ class SyncerCommandTestBase : public testing::Test,
   sessions::SyncSessionContext* context() const { return context_.get(); }
   sessions::SyncSession::Delegate* delegate() { return this; }
 
-  // Lazily create a session requesting all datatypes with no payload.
+  // Lazily create a session requesting all datatypes with no state.
   sessions::SyncSession* session() {
-    ModelTypePayloadMap types =
-        ModelSafeRoutingInfoToPayloadMap(routing_info_, std::string());
+    ModelTypeStateMap types =
+        ModelSafeRoutingInfoToStateMap(routing_info_, std::string());
     return session(sessions::SyncSourceInfo(types));
   }