[Sync] Make P2PNotifier behave more like InvalidationNotifier

chrome/browser/sync/syncable/model_type_payload_map_unittest.cc

Index: chrome/browser/sync/syncable/model_type_payload_map_unittest.cc
diff --git a/chrome/browser/sync/syncable/model_type_payload_map_unittest.cc b/chrome/browser/sync/syncable/model_type_payload_map_unittest.cc
index cb9324bd2e25ceeb22ce56d0baef8fa2a773cc9c..54e54fd9ad3ff3afdfa7f42688fac104c6300b29 100644
--- a/chrome/browser/sync/syncable/model_type_payload_map_unittest.cc
+++ b/chrome/browser/sync/syncable/model_type_payload_map_unittest.cc
@@ -18,10 +18,21 @@ using test::ExpectDictStringValue;
 
 class ModelTypePayloadMapTest : public testing::Test {};
 
+TEST_F(ModelTypePayloadMapTest, TypePayloadMapToSet) {
+  ModelTypePayloadMap payloads;
+  payloads[BOOKMARKS] = "bookmarkpayload";
+  payloads[APPS] = "";
+
+  ModelTypeSet types;
+  types.insert(BOOKMARKS);
+  types.insert(APPS);
+  EXPECT_EQ(types, ModelTypePayloadMapToSet(payloads));
+}
+
 TEST_F(ModelTypePayloadMapTest, TypePayloadMapToValue) {
   ModelTypePayloadMap payloads;
-  payloads[syncable::BOOKMARKS] = "bookmarkpayload";
-  payloads[syncable::APPS] = "";
+  payloads[BOOKMARKS] = "bookmarkpayload";
+  payloads[APPS] = "";
 
   scoped_ptr<DictionaryValue> value(ModelTypePayloadMapToValue(payloads));
   EXPECT_EQ(2u, value->size());