Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

sync/notifier/object_id_state_map_test_util.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.
+
+#ifndef SYNC_NOTIFIER_OBJECT_ID_STATE_MAP_TEST_UTILH_
+#define SYNC_NOTIFIER_OBJECT_ID_STATE_MAP_TEST_UTILH_
+
+#include "sync/internal_api/public/base/invalidation_state_test_util.h"

[akalin, 2012/08/22 22:24:31]

do we need to explicitly include _test_util.h here?

[dcheng, 2012/08/22 22:53:19]

This was the only way I could convince Googletest to uniformly use the PrintTo
overload for InvalidationState; for some reason, including it in the .cc wasn't
always enough.

[akalin, 2012/08/22 23:24:27]

That's weird.  Add a comment?

[dcheng, 2012/08/22 23:47:11]

Done.

+#include "sync/notifier/object_id_state_map.h"

[akalin, 2012/08/22 22:24:31]

can we forward-declare?

[dcheng, 2012/08/22 22:53:19]

It's a typedef, so I don't think so.

[akalin, 2012/08/22 23:24:27]

oh, right.

+#include "testing/gmock/include/gmock/gmock.h"
+
+namespace syncer {
+
+::testing::Matcher<const ObjectIdStateMap&> Eq(
+    const ObjectIdStateMap& expected);
+
+}  // namespace syncer
+
+#endif  // SYNC_NOTIFIER_OBJECT_ID_STATE_MAP_TEST_UTILH_