Rename ModelType/ObjectIdStateMap to InvalidationMap.

sync/internal_api/public/base/invalidation_state_test_util.h

Index: sync/internal_api/public/base/invalidation_state_test_util.h
diff --git a/sync/internal_api/public/base/invalidation_state_test_util.h b/sync/internal_api/public/base/invalidation_state_test_util.h
deleted file mode 100644
index 77baccb62521e608484fdc94dd7ba566dbcdda6b..0000000000000000000000000000000000000000
--- a/sync/internal_api/public/base/invalidation_state_test_util.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// 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_INVALIDATION_STATE_TEST_UTIL_H_
-#define SYNC_INTERNAL_API_PUBLIC_BASE_INVALIDATION_STATE_TEST_UTIL_H_
-
-#include <iosfwd>
-
-#include "testing/gmock/include/gmock/gmock.h"
-
-namespace syncer {
-
-struct InvalidationState;
-
-void PrintTo(const InvalidationState& state, ::std::ostream* os);
-
-::testing::Matcher<const InvalidationState&> Eq(
-    const InvalidationState& expected);
-
-}  // namespace syncer
-
-#endif  // SYNC_INTERNAL_API_PUBLIC_BASE_INVALIDATION_STATE_TEST_UTIL_H_