Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

sync/notifier/chrome_invalidation_client_unittest.cc

 // 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.
 
 #include <cstddef>
 #include <set>
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
@@ skipping 122 matching lines @@
  public:
   FakeListener() : reason_(TRANSIENT_NOTIFICATION_ERROR) {}
   virtual ~FakeListener() {}
 
   int GetInvalidationCount(const ObjectId& id) const {
     ObjectIdCountMap::const_iterator it = invalidation_counts_.find(id);
     return (it == invalidation_counts_.end()) ? 0 : it->second;
   }
 
   std::string GetPayload(const ObjectId& id) const {
-    ObjectIdPayloadMap::const_iterator it = payloads_.find(id);
-    return (it == payloads_.end()) ? "" : it->second;
+    ObjectIdStateMap::const_iterator it = states_.find(id);
+    return (it == states_.end()) ? "" : it->second.payload;
   }
 
   // NO_NOTIFICATION_ERROR is the enabled state.
   NotificationsDisabledReason GetNotificationsDisabledReason() const {
     return reason_;
   }
 
   // ChromeInvalidationClient::Listener implementation.
 
-  virtual void OnInvalidate(const ObjectIdPayloadMap& id_payloads) OVERRIDE {
-    for (ObjectIdPayloadMap::const_iterator it = id_payloads.begin();
-         it != id_payloads.end(); ++it) {
+  virtual void OnInvalidate(const ObjectIdStateMap& id_state_map) OVERRIDE {
+    for (ObjectIdStateMap::const_iterator it = id_state_map.begin();
+         it != id_state_map.end(); ++it) {
       ++invalidation_counts_[it->first];
-      payloads_[it->first] = it->second;
+      states_[it->first] = it->second;
     }
   }
 
   virtual void OnNotificationsEnabled() {
     reason_ = NO_NOTIFICATION_ERROR;
   }
 
   virtual void OnNotificationsDisabled(NotificationsDisabledReason reason) {
     reason_ = reason;
   }
 
  private:
   typedef std::map<ObjectId, int, ObjectIdLessThan> ObjectIdCountMap;
   ObjectIdCountMap invalidation_counts_;
-  ObjectIdPayloadMap payloads_;
+  ObjectIdStateMap states_;
   NotificationsDisabledReason reason_;
 };
 
 invalidation::InvalidationClient* CreateFakeInvalidationClient(
     FakeInvalidationClient** fake_invalidation_client,
     invalidation::SystemResources* resources,
     int client_type,
     const invalidation::string& client_name,
     const invalidation::string& application_name,
     invalidation::InvalidationListener* listener) {
@@ skipping 571 matching lines @@
             GetNotificationsDisabledReason());
 
   client_.Ready(fake_invalidation_client_);
 
   EXPECT_EQ(NO_NOTIFICATION_ERROR, GetNotificationsDisabledReason());
 }
 
 }  // namespace
 
 }  // namespace syncer