Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_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 "chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.h"
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_delegate.h"
 #include "chrome/browser/sync/invalidation_frontend.h"
@@ skipping 141 matching lines @@
   ids.insert(invalidation::ObjectId(
       ipc::invalidation::ObjectSource::CHROME_COMPONENTS,
       "U/dddddddddddddddddddddddddddddddd/0"));
   ids.insert(invalidation::ObjectId(
       ipc::invalidation::ObjectSource::CHROME_COMPONENTS,
       "U/dddddddddddddddddddddddddddddddd/3"));
   EXPECT_CALL(delegate_,
               OnMessage("dddddddddddddddddddddddddddddddd", 0, "payload"));
   EXPECT_CALL(delegate_,
               OnMessage("dddddddddddddddddddddddddddddddd", 3, "payload"));
-  handler_->OnIncomingNotification(ObjectIdSetToPayloadMap(ids, "payload"),
+  handler_->OnIncomingNotification(ObjectIdSetToStateMap(ids, "payload"),
                                    syncer::REMOTE_NOTIFICATION);
 }
 
 // Tests that malformed object IDs don't trigger spurious callbacks.
 TEST_F(PushMessagingInvalidationHandlerTest, DispatchInvalidObjectIds) {
   syncer::ObjectIdSet ids;
   // Completely incorrect format.
   ids.insert(invalidation::ObjectId(
       ipc::invalidation::ObjectSource::TEST,
       "Invalid"));
@@ skipping 10 matching lines @@
       ipc::invalidation::ObjectSource::CHROME_COMPONENTS,
       "U/ddddddddddddddddddddddddddddddddd/3"));
   // Non-numeric subchannel.
   ids.insert(invalidation::ObjectId(
       ipc::invalidation::ObjectSource::CHROME_COMPONENTS,
       "U/dddddddddddddddddddddddddddddddd/z"));
   // Subchannel out of range.
   ids.insert(invalidation::ObjectId(
       ipc::invalidation::ObjectSource::CHROME_COMPONENTS,
       "U/dddddddddddddddddddddddddddddddd/4"));
-  handler_->OnIncomingNotification(ObjectIdSetToPayloadMap(ids, "payload"),
+  handler_->OnIncomingNotification(ObjectIdSetToStateMap(ids, "payload"),
                                    syncer::REMOTE_NOTIFICATION);
 }
 
 }  // namespace extensions