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

Previously they were in 'syncer::syncable'.

Also remove aliases to those classes from 'syncable'.

BUG=128060
TEST=
TBR=pkasting@chromium.org,jhawkins@chromium.org,

Review URL: https://chromiumcodereview.appspot.com/10696087

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145399 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 6 deletions

diff --git a/sync/internal_api/public/base/model_type_payload_map.cc b/sync/internal_api/public/base/model_type_payload_map.cc
index 8fb458c..04222ee 100644
--- a/sync/internal_api/public/base/model_type_payload_map.cc
+++ b/sync/internal_api/public/base/model_type_payload_map.cc
@@ -12,13 +12,12 @@
 #include "base/values.h"
 
 namespace syncer {
-namespace syncable {
 
 ModelTypePayloadMap ModelTypePayloadMapFromEnumSet(
-    syncable::ModelTypeSet types,
+    syncer::ModelTypeSet types,
     const std::string& payload) {
   ModelTypePayloadMap types_with_payloads;
-  for (syncable::ModelTypeSet::Iterator it = types.First();
+  for (syncer::ModelTypeSet::Iterator it = types.First();
        it.Good(); it.Inc()) {
     types_with_payloads[it.Get()] = payload;
   }
@@ -53,7 +52,7 @@ DictionaryValue* ModelTypePayloadMapToValue(
     std::string base64_marker;
     bool encoded = base::Base64Encode(it->second, &base64_marker);
     DCHECK(encoded);
-    value->SetString(syncable::ModelTypeToString(it->first), base64_marker);
+    value->SetString(syncer::ModelTypeToString(it->first), base64_marker);
   }
   return value;
 }
@@ -74,6 +73,4 @@ void CoalescePayloads(ModelTypePayloadMap* original,
   }
 }
 
-}  // namespace syncable
 }  // namespace syncer
-