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

chrome/browser/sync/glue/session_model_associator.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_model_associator.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
@@ skipping 34 matching lines @@
 #include "base/linux_util.h"
 #elif defined(OS_WIN)
 #include <windows.h>
 #elif defined(OS_ANDROID)
 #include "sync/util/session_utils_android.h"
 #endif
 
 using content::BrowserThread;
 using content::NavigationEntry;
 using prefs::kSyncSessionsGUID;
-using syncable::SESSIONS;
+using syncer::SESSIONS;
 
 namespace browser_sync {
 
 namespace {
 static const char kNoSessionsFolderError[] =
     "Server did not create the top-level sessions node. We "
     "might be running against an out-of-date server.";
 
 // The maximum number of navigations in each direction we care to sync.
 static const int kMaxSyncNavigationCount = 6;
@@ skipping 672 matching lines @@
   DCHECK_EQ(0U, tab_pool_.capacity());
 
   local_session_syncid_ = syncer::kInvalidId;
 
   // Read any available foreign sessions and load any session data we may have.
   // If we don't have any local session data in the db, create a header node.
   {
     syncer::WriteTransaction trans(FROM_HERE, sync_service_->GetUserShare());
 
     syncer::ReadNode root(&trans);
-    if (root.InitByTagLookup(syncable::ModelTypeToRootTag(model_type())) !=
+    if (root.InitByTagLookup(syncer::ModelTypeToRootTag(model_type())) !=
             syncer::BaseNode::INIT_OK) {
       return error_handler_->CreateAndUploadError(
           FROM_HERE,
           kNoSessionsFolderError,
           model_type());
     }
 
     // Make sure we have a machine tag.
     if (current_machine_tag_.empty()) {
       InitializeCurrentMachineTag(&trans);
@@ skipping 631 matching lines @@
 }
 
 void SessionModelAssociator::TabNodePool::FreeTabNode(int64 sync_id) {
   // Pool size should always match # of free tab nodes.
   DCHECK_LT(tab_pool_fp_, static_cast<int64>(tab_syncid_pool_.size()));
   tab_syncid_pool_[static_cast<size_t>(++tab_pool_fp_)] = sync_id;
 }
 
 void SessionModelAssociator::AttemptSessionsDataRefresh() const {
   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));
 }
 
 bool SessionModelAssociator::GetLocalSession(
     const SyncedSession* * local_session) {
   DCHECK(CalledOnValidThread());
   if (current_machine_tag_.empty())
     return false;
   *local_session = synced_session_tracker_.GetSession(GetCurrentMachineTag());
   return true;
 }
@@ skipping 157 matching lines @@
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&SessionModelAssociator::QuitLoopForSubtleTesting,
                  test_weak_factory_.GetWeakPtr()),
       base::TimeDelta::FromMilliseconds(timeout_milliseconds));
 }
 
 bool SessionModelAssociator::CryptoReadyIfNecessary() {
   // We only access the cryptographer while holding a transaction.
   syncer::ReadTransaction trans(FROM_HERE, sync_service_->GetUserShare());
-  const syncable::ModelTypeSet encrypted_types =
+  const syncer::ModelTypeSet encrypted_types =
       syncer::GetEncryptedTypes(&trans);
   return !encrypted_types.Has(SESSIONS) ||
          sync_service_->IsCryptographerReady(&trans);
 }
 
 }  // namespace browser_sync