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

chrome/browser/sync/glue/session_change_processor.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/sync/glue/session_change_processor.h"
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 195 matching lines @@
   // it being a modified tab, we know the tab is active (so we won't do
   // refreshes just because the refresh page is open in a background tab).
   if (!modified_tabs.empty()) {
     SyncedTabDelegate* tab = modified_tabs.front();
     const content::NavigationEntry* entry = tab->GetActiveEntry();
     if (!tab->IsBeingDestroyed() &&
         entry &&
         entry->GetVirtualURL().is_valid() &&
         entry->GetVirtualURL().spec() == kNTPOpenTabSyncURL) {
       DVLOG(1) << "Triggering sync refresh for sessions datatype.";
-      const syncable::ModelType type = syncable::SESSIONS;
-      syncable::ModelTypePayloadMap payload_map;
+      const syncer::ModelType type = syncer::SESSIONS;
+      syncer::ModelTypePayloadMap payload_map;
       payload_map[type] = "";
       content::NotificationService::current()->Notify(
           chrome::NOTIFICATION_SYNC_REFRESH_LOCAL,
           content::Source<Profile>(profile_),
-          content::Details<const syncable::ModelTypePayloadMap>(&payload_map));
+          content::Details<const syncer::ModelTypePayloadMap>(&payload_map));
     }
   }
 
   // Associate tabs first so the synced session tracker is aware of them.
   // Note that if we fail to associate, it means something has gone wrong,
   // such as our local session being deleted, so we disassociate and associate
   // again.
   bool reassociation_needed = !modified_tabs.empty() &&
       !session_model_associator_->AssociateTabs(modified_tabs, NULL);
 
@@ skipping 37 matching lines @@
 
   std::string local_tag = session_model_associator_->GetCurrentMachineTag();
   for (syncer::ChangeRecordList::const_iterator it =
            changes.Get().begin(); it != changes.Get().end(); ++it) {
     const syncer::ChangeRecord& change = *it;
     syncer::ChangeRecord::Action action(change.action);
     if (syncer::ChangeRecord::ACTION_DELETE == action) {
       // Deletions are all or nothing (since we only ever delete entire
       // sessions). Therefore we don't care if it's a tab node or meta node,
       // and just ensure we've disassociated.
-      DCHECK_EQ(syncable::GetModelTypeFromSpecifics(it->specifics),
-                syncable::SESSIONS);
+      DCHECK_EQ(syncer::GetModelTypeFromSpecifics(it->specifics),
+                syncer::SESSIONS);
       const sync_pb::SessionSpecifics& specifics = it->specifics.session();
       if (specifics.session_tag() == local_tag) {
         // Another client has attempted to delete our local data (possibly by
         // error or their/our clock is inaccurate). Just ignore the deletion
         // for now to avoid any possible ping-pong delete/reassociate sequence.
         LOG(WARNING) << "Local session data deleted. Ignoring until next local "
                      << "navigation event.";
       } else {
         session_model_associator_->DisassociateForeignSession(
             specifics.session_tag());
       }
       continue;
     }
 
     // Handle an update or add.
     syncer::ReadNode sync_node(trans);
     if (sync_node.InitByIdLookup(change.id) != syncer::BaseNode::INIT_OK) {
       error_handler()->OnSingleDatatypeUnrecoverableError(FROM_HERE,
           "Session node lookup failed.");
       return;
     }
 
     // Check that the changed node is a child of the session folder.
     DCHECK(root.GetId() == sync_node.GetParentId());
-    DCHECK(syncable::SESSIONS == sync_node.GetModelType());
+    DCHECK(syncer::SESSIONS == sync_node.GetModelType());
 
     const sync_pb::SessionSpecifics& specifics(
         sync_node.GetSessionSpecifics());
     if (specifics.session_tag() == local_tag &&
         !setup_for_test_) {
       // We should only ever receive a change to our own machine's session info
       // if encryption was turned on. In that case, the data is still the same,
       // so we can ignore.
       LOG(WARNING) << "Dropping modification to local session.";
       return;
@@ skipping 49 matching lines @@
   notification_registrar_.Add(this, chrome::NOTIFICATION_FAVICON_CHANGED,
       content::Source<Profile>(profile_));
 }
 
 void SessionChangeProcessor::StopObserving() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   notification_registrar_.RemoveAll();
 }
 
 }  // namespace browser_sync