Refactor common invalidation framework types

sync/internal_api/public/base/invalidation_test_util.cc

Index: sync/internal_api/public/base/invalidation_test_util.cc
diff --git a/sync/internal_api/public/base/invalidation_test_util.cc b/sync/internal_api/public/base/invalidation_test_util.cc
index 3f3910be72f1f857c614a703da4e3ca10fb92a7e..d9b5577b700dc60ddf171e98379af8066f15fca4 100644
--- a/sync/internal_api/public/base/invalidation_test_util.cc
+++ b/sync/internal_api/public/base/invalidation_test_util.cc
@@ -75,7 +75,7 @@ InvalidationEqMatcher::InvalidationEqMatcher(
 
 bool InvalidationEqMatcher::MatchAndExplain(
     const Invalidation& actual, MatchResultListener* listener) const {
-  return expected_.payload == actual.payload;
+  return expected_.GetPayload() == actual.GetPayload();
 }
 
 void InvalidationEqMatcher::DescribeTo(::std::ostream* os) const {
@@ -101,7 +101,7 @@ Matcher<const AckHandle&> Eq(const AckHandle& expected) {
 
 void PrintTo(const Invalidation& state, ::std::ostream* os) {
   std::string printable_payload;
-  base::JsonDoubleQuote(state.payload,
+  base::JsonDoubleQuote(state.GetPayload(),
                         true /* put_in_quotes */,
                         &printable_payload);
   *os << "{ payload: " << printable_payload << " }";