[Sync] Move ModelType and related classes to 'syncer' namespace

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/base/model_type_payload_map_unittest.cc b/sync/internal_api/public/base/model_type_payload_map_unittest.cc
index 485048dae6d051a244fd5cf5c94bdba1ae21d2c2..1a20867d3577190b42a857576d00ddaa4739c8a6 100644
--- a/sync/internal_api/public/base/model_type_payload_map_unittest.cc
+++ b/sync/internal_api/public/base/model_type_payload_map_unittest.cc
@@ -13,7 +13,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
-namespace syncable {
 namespace {
 
 using base::ExpectDictStringValue;
@@ -44,32 +43,31 @@ TEST_F(ModelTypePayloadMapTest, TypePayloadMapToValue) {
 }
 
 TEST_F(ModelTypePayloadMapTest, CoalescePayloads) {
-  syncable::ModelTypePayloadMap original;
+  syncer::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;
+  original[syncer::BOOKMARKS] = empty_payload;
+  original[syncer::PASSWORDS] = payload1;
+  original[syncer::AUTOFILL] = payload2;
+  original[syncer::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.
+  syncer::ModelTypePayloadMap update;
+  update[syncer::BOOKMARKS] = empty_payload;  // Same.
+  update[syncer::PASSWORDS] = empty_payload;  // Overwrite with empty.
+  update[syncer::AUTOFILL] = payload1;        // Overwrite with non-empty.
+  update[syncer::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]);
+  EXPECT_EQ(empty_payload, original[syncer::BOOKMARKS]);
+  EXPECT_EQ(payload1, original[syncer::PASSWORDS]);
+  EXPECT_EQ(payload1, original[syncer::AUTOFILL]);
+  EXPECT_EQ(payload2, original[syncer::SESSIONS]);
+  EXPECT_EQ(payload3, original[syncer::THEMES]);
 }
 
 }  // namespace
-}  // namespace syncable
 }  // namespace syncer