Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

sync/internal_api/public/base/model_type_state_map_test_util.h

Index: sync/internal_api/public/base/model_type_state_map_test_util.h
diff --git a/sync/internal_api/public/base/model_type_state_map_test_util.h b/sync/internal_api/public/base/model_type_state_map_test_util.h
new file mode 100644
index 0000000000000000000000000000000000000000..35388160b20e9d01794bacd4ef51d3b16625080c
--- /dev/null
+++ b/sync/internal_api/public/base/model_type_state_map_test_util.h
@@ -0,0 +1,20 @@
+// 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.
+
+#ifndef SYNC_INTERNAL_API_PUBLIC_BASE_MODEL_TYPE_STATE_MAP_TEST_UTIL_H_
+#define SYNC_INTERNAL_API_PUBLIC_BASE_MODEL_TYPE_STATE_MAP_TEST_UTIL_H_
+
+// Convince googletest to use the correct overload for PrintTo().
+#include "sync/internal_api/public/base/invalidation_state_test_util.h"
+#include "sync/internal_api/public/base/model_type_state_map.h"
+#include "testing/gmock/include/gmock/gmock.h"
+
+namespace syncer {
+
+::testing::Matcher<const ModelTypeStateMap&> Eq(
+    const ModelTypeStateMap& expected);
+
+}  // namespace syncer
+
+#endif  // SYNC_INTERNAL_API_PUBLIC_BASE_MODEL_TYPE_STATE_MAP_TEST_UTIL_H_