[Sync] Move model_type* from syncable/ to base/

sync/internal_api/public/base/model_type_payload_map_unittest.cc

Index: sync/internal_api/public/base/model_type_payload_map_unittest.cc
diff --git a/sync/internal_api/public/syncable/model_type_payload_map_unittest.cc b/sync/internal_api/public/base/model_type_payload_map_unittest.cc
similarity index 53%
rename from sync/internal_api/public/syncable/model_type_payload_map_unittest.cc
rename to sync/internal_api/public/base/model_type_payload_map_unittest.cc
index dad782b018db7aabeebb5507951f7733126a4be1..485048dae6d051a244fd5cf5c94bdba1ae21d2c2 100644
--- a/sync/internal_api/public/syncable/model_type_payload_map_unittest.cc
+++ b/sync/internal_api/public/base/model_type_payload_map_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sync/internal_api/public/syncable/model_type_payload_map.h"
+#include "sync/internal_api/public/base/model_type_payload_map.h"
 
 #include <string>
 
@@ -43,6 +43,33 @@ TEST_F(ModelTypePayloadMapTest, TypePayloadMapToValue) {
   EXPECT_FALSE(value->HasKey("Preferences"));
 }
 
+TEST_F(ModelTypePayloadMapTest, CoalescePayloads) {
+  syncable::ModelTypePayloadMap original;
+  std::string empty_payload;
+  std::string payload1 = "payload1";
+  std::string payload2 = "payload2";
+  std::string payload3 = "payload3";
+  original[syncable::BOOKMARKS] = empty_payload;
+  original[syncable::PASSWORDS] = payload1;
+  original[syncable::AUTOFILL] = payload2;
+  original[syncable::THEMES] = payload3;
+
+  syncable::ModelTypePayloadMap update;
+  update[syncable::BOOKMARKS] = empty_payload;  // Same.
+  update[syncable::PASSWORDS] = empty_payload;  // Overwrite with empty.
+  update[syncable::AUTOFILL] = payload1;        // Overwrite with non-empty.
+  update[syncable::SESSIONS] = payload2;        // New.
+  // Themes untouched.
+
+  CoalescePayloads(&original, update);
+  ASSERT_EQ(5U, original.size());
+  EXPECT_EQ(empty_payload, original[syncable::BOOKMARKS]);
+  EXPECT_EQ(payload1, original[syncable::PASSWORDS]);
+  EXPECT_EQ(payload1, original[syncable::AUTOFILL]);
+  EXPECT_EQ(payload2, original[syncable::SESSIONS]);
+  EXPECT_EQ(payload3, original[syncable::THEMES]);
+}
+
 }  // namespace
 }  // namespace syncable
 }  // namespace syncer