[Sync] Move //components/sync to the syncer namespace, take 2.

components/sync/driver/glue/sync_backend_host_core.cc

Index: components/sync/driver/glue/sync_backend_host_core.cc
diff --git a/components/sync/driver/glue/sync_backend_host_core.cc b/components/sync/driver/glue/sync_backend_host_core.cc
index f069467b4d9fc0750612bacdf37edeec5bfc998c..c6e25019f7646de035b1cbefd7022f9a7cbf4e77 100644
--- a/components/sync/driver/glue/sync_backend_host_core.cc
+++ b/components/sync/driver/glue/sync_backend_host_core.cc
@@ -53,31 +53,28 @@ void BindFetcherToDataTracker(net::URLFetcher* fetcher) {
 
 }  // namespace
 
-namespace browser_sync {
+namespace syncer {
 
 DoInitializeOptions::DoInitializeOptions(
     base::MessageLoop* sync_loop,
     SyncBackendRegistrar* registrar,
-    const std::vector<scoped_refptr<syncer::ModelSafeWorker>>& workers,
-    const scoped_refptr<syncer::ExtensionsActivity>& extensions_activity,
-    const syncer::WeakHandle<syncer::JsEventHandler>& event_handler,
+    const std::vector<scoped_refptr<ModelSafeWorker>>& workers,
+    const scoped_refptr<ExtensionsActivity>& extensions_activity,
+    const WeakHandle<JsEventHandler>& event_handler,
     const GURL& service_url,
     const std::string& sync_user_agent,
-    std::unique_ptr<syncer::HttpPostProviderFactory> http_bridge_factory,
-    const syncer::SyncCredentials& credentials,
+    std::unique_ptr<HttpPostProviderFactory> http_bridge_factory,
+    const SyncCredentials& credentials,
     const std::string& invalidator_client_id,
-    std::unique_ptr<syncer::SyncManagerFactory> sync_manager_factory,
+    std::unique_ptr<SyncManagerFactory> sync_manager_factory,
     bool delete_sync_data_folder,
     const std::string& restored_key_for_bootstrapping,
     const std::string& restored_keystore_key_for_bootstrapping,
-    std::unique_ptr<syncer::InternalComponentsFactory>
-        internal_components_factory,
-    const syncer::WeakHandle<syncer::UnrecoverableErrorHandler>&
-        unrecoverable_error_handler,
+    std::unique_ptr<InternalComponentsFactory> internal_components_factory,
+    const WeakHandle<UnrecoverableErrorHandler>& unrecoverable_error_handler,
     const base::Closure& report_unrecoverable_error_function,
-    std::unique_ptr<syncer::SyncEncryptionHandler::NigoriState>
-        saved_nigori_state,
-    const std::map<syncer::ModelType, int64_t>& invalidation_versions)
+    std::unique_ptr<SyncEncryptionHandler::NigoriState> saved_nigori_state,
+    const std::map<ModelType, int64_t>& invalidation_versions)
     : sync_loop(sync_loop),
       registrar(registrar),
       workers(workers),
@@ -130,7 +127,7 @@ SyncBackendHostCore::~SyncBackendHostCore() {
 }
 
 void SyncBackendHostCore::OnSyncCycleCompleted(
-    const syncer::SyncCycleSnapshot& snapshot) {
+    const SyncCycleSnapshot& snapshot) {
   if (!sync_loop_)
     return;
   DCHECK(sync_loop_->task_runner()->BelongsToCurrentThread());
@@ -140,21 +137,20 @@ void SyncBackendHostCore::OnSyncCycleCompleted(
              snapshot);
 }
 
-void SyncBackendHostCore::DoRefreshTypes(syncer::ModelTypeSet types) {
+void SyncBackendHostCore::DoRefreshTypes(ModelTypeSet types) {
   DCHECK(sync_loop_->task_runner()->BelongsToCurrentThread());
   sync_manager_->RefreshTypes(types);
 }
 
 void SyncBackendHostCore::OnInitializationComplete(
-    const syncer::WeakHandle<syncer::JsBackend>& js_backend,
-    const syncer::WeakHandle<syncer::DataTypeDebugInfoListener>&
-        debug_info_listener,
+    const WeakHandle<JsBackend>& js_backend,
+    const WeakHandle<DataTypeDebugInfoListener>& debug_info_listener,
     bool success,
-    const syncer::ModelTypeSet restored_types) {
+    const ModelTypeSet restored_types) {
   DCHECK(sync_loop_->task_runner()->BelongsToCurrentThread());
 
   if (!success) {
-    DoDestroySyncManager(syncer::STOP_SYNC);
+    DoDestroySyncManager(STOP_SYNC);
     host_.Call(FROM_HERE,
                &SyncBackendHostImpl::HandleInitializationFailureOnFrontendLoop);
     return;
@@ -185,31 +181,29 @@ void SyncBackendHostCore::OnInitializationComplete(
   // all control types have already completed their initial sync.
   registrar_->SetInitialTypes(restored_types);
 
-  syncer::ConfigureReason reason =
-      restored_types.Empty() ? syncer::CONFIGURE_REASON_NEW_CLIENT
-                             : syncer::CONFIGURE_REASON_NEWLY_ENABLED_DATA_TYPE;
+  ConfigureReason reason = restored_types.Empty()
+                               ? CONFIGURE_REASON_NEW_CLIENT
+                               : CONFIGURE_REASON_NEWLY_ENABLED_DATA_TYPE;
 
-  syncer::ModelTypeSet new_control_types = registrar_->ConfigureDataTypes(
-      syncer::ControlTypes(), syncer::ModelTypeSet());
-  syncer::ModelSafeRoutingInfo routing_info;
+  ModelTypeSet new_control_types =
+      registrar_->ConfigureDataTypes(ControlTypes(), ModelTypeSet());
+  ModelSafeRoutingInfo routing_info;
   registrar_->GetModelSafeRoutingInfo(&routing_info);
-  SDVLOG(1) << "Control Types "
-            << syncer::ModelTypeSetToString(new_control_types)
+  SDVLOG(1) << "Control Types " << ModelTypeSetToString(new_control_types)
             << " added; calling ConfigureSyncer";
 
-  syncer::ModelTypeSet types_to_purge = syncer::Difference(
-      syncer::ModelTypeSet::All(), GetRoutingInfoTypes(routing_info));
+  ModelTypeSet types_to_purge =
+      Difference(ModelTypeSet::All(), GetRoutingInfoTypes(routing_info));
 
   sync_manager_->ConfigureSyncer(
-      reason, new_control_types, types_to_purge, syncer::ModelTypeSet(),
-      syncer::ModelTypeSet(), routing_info,
+      reason, new_control_types, types_to_purge, ModelTypeSet(), ModelTypeSet(),
+      routing_info,
       base::Bind(&SyncBackendHostCore::DoInitialProcessControlTypes,
                  weak_ptr_factory_.GetWeakPtr()),
       base::Closure());
 }
 
-void SyncBackendHostCore::OnConnectionStatusChange(
-    syncer::ConnectionStatus status) {
+void SyncBackendHostCore::OnConnectionStatusChange(ConnectionStatus status) {
   if (!sync_loop_)
     return;
   DCHECK(sync_loop_->task_runner()->BelongsToCurrentThread());
@@ -219,7 +213,7 @@ void SyncBackendHostCore::OnConnectionStatusChange(
 }
 
 void SyncBackendHostCore::OnPassphraseRequired(
-    syncer::PassphraseRequiredReason reason,
+    PassphraseRequiredReason reason,
     const sync_pb::EncryptedData& pending_keys) {
   if (!sync_loop_)
     return;
@@ -237,7 +231,7 @@ void SyncBackendHostCore::OnPassphraseAccepted() {
 
 void SyncBackendHostCore::OnBootstrapTokenUpdated(
     const std::string& bootstrap_token,
-    syncer::BootstrapTokenType type) {
+    BootstrapTokenType type) {
   if (!sync_loop_)
     return;
   DCHECK(sync_loop_->task_runner()->BelongsToCurrentThread());
@@ -245,9 +239,8 @@ void SyncBackendHostCore::OnBootstrapTokenUpdated(
              bootstrap_token, type);
 }
 
-void SyncBackendHostCore::OnEncryptedTypesChanged(
-    syncer::ModelTypeSet encrypted_types,
-    bool encrypt_everything) {
+void SyncBackendHostCore::OnEncryptedTypesChanged(ModelTypeSet encrypted_types,
+                                                  bool encrypt_everything) {
   if (!sync_loop_)
     return;
   DCHECK(sync_loop_->task_runner()->BelongsToCurrentThread());
@@ -265,11 +258,11 @@ void SyncBackendHostCore::OnEncryptionComplete() {
 }
 
 void SyncBackendHostCore::OnCryptographerStateChanged(
-    syncer::Cryptographer* cryptographer) {
+    Cryptographer* cryptographer) {
   // Do nothing.
 }
 
-void SyncBackendHostCore::OnPassphraseTypeChanged(syncer::PassphraseType type,
+void SyncBackendHostCore::OnPassphraseTypeChanged(PassphraseType type,
                                                   base::Time passphrase_time) {
   host_.Call(FROM_HERE,
              &SyncBackendHostImpl::HandlePassphraseTypeChangedOnFrontendLoop,
@@ -277,7 +270,7 @@ void SyncBackendHostCore::OnPassphraseTypeChanged(syncer::PassphraseType type,
 }
 
 void SyncBackendHostCore::OnLocalSetPassphraseEncryption(
-    const syncer::SyncEncryptionHandler::NigoriState& nigori_state) {
+    const SyncEncryptionHandler::NigoriState& nigori_state) {
   host_.Call(
       FROM_HERE,
       &SyncBackendHostImpl::HandleLocalSetPassphraseEncryptionOnFrontendLoop,
@@ -285,8 +278,8 @@ void SyncBackendHostCore::OnLocalSetPassphraseEncryption(
 }
 
 void SyncBackendHostCore::OnCommitCountersUpdated(
-    syncer::ModelType type,
-    const syncer::CommitCounters& counters) {
+    ModelType type,
+    const CommitCounters& counters) {
   host_.Call(
       FROM_HERE,
       &SyncBackendHostImpl::HandleDirectoryCommitCountersUpdatedOnFrontendLoop,
@@ -294,8 +287,8 @@ void SyncBackendHostCore::OnCommitCountersUpdated(
 }
 
 void SyncBackendHostCore::OnUpdateCountersUpdated(
-    syncer::ModelType type,
-    const syncer::UpdateCounters& counters) {
+    ModelType type,
+    const UpdateCounters& counters) {
   host_.Call(
       FROM_HERE,
       &SyncBackendHostImpl::HandleDirectoryUpdateCountersUpdatedOnFrontendLoop,
@@ -303,8 +296,8 @@ void SyncBackendHostCore::OnUpdateCountersUpdated(
 }
 
 void SyncBackendHostCore::OnStatusCountersUpdated(
-    syncer::ModelType type,
-    const syncer::StatusCounters& counters) {
+    ModelType type,
+    const StatusCounters& counters) {
   host_.Call(
       FROM_HERE,
       &SyncBackendHostImpl::HandleDirectoryStatusCountersUpdatedOnFrontendLoop,
@@ -312,7 +305,7 @@ void SyncBackendHostCore::OnStatusCountersUpdated(
 }
 
 void SyncBackendHostCore::OnActionableError(
-    const syncer::SyncProtocolError& sync_error) {
+    const SyncProtocolError& sync_error) {
   if (!sync_loop_)
     return;
   DCHECK(sync_loop_->task_runner()->BelongsToCurrentThread());
@@ -321,53 +314,52 @@ void SyncBackendHostCore::OnActionableError(
              sync_error);
 }
 
-void SyncBackendHostCore::OnMigrationRequested(syncer::ModelTypeSet types) {
+void SyncBackendHostCore::OnMigrationRequested(ModelTypeSet types) {
   DCHECK(sync_loop_->task_runner()->BelongsToCurrentThread());
   host_.Call(FROM_HERE,
              &SyncBackendHostImpl::HandleMigrationRequestedOnFrontendLoop,
              types);
 }
 
-void SyncBackendHostCore::OnProtocolEvent(const syncer::ProtocolEvent& event) {
+void SyncBackendHostCore::OnProtocolEvent(const ProtocolEvent& event) {
   if (forward_protocol_events_) {
-    std::unique_ptr<syncer::ProtocolEvent> event_clone(event.Clone());
+    std::unique_ptr<ProtocolEvent> event_clone(event.Clone());
     host_.Call(FROM_HERE,
                &SyncBackendHostImpl::HandleProtocolEventOnFrontendLoop,
                base::Passed(std::move(event_clone)));
   }
 }
 
-void SyncBackendHostCore::DoOnInvalidatorStateChange(
-    syncer::InvalidatorState state) {
+void SyncBackendHostCore::DoOnInvalidatorStateChange(InvalidatorState state) {
   DCHECK(sync_loop_->task_runner()->BelongsToCurrentThread());
-  sync_manager_->SetInvalidatorEnabled(state == syncer::INVALIDATIONS_ENABLED);
+  sync_manager_->SetInvalidatorEnabled(state == INVALIDATIONS_ENABLED);
 }
 
 void SyncBackendHostCore::DoOnIncomingInvalidation(
-    const syncer::ObjectIdInvalidationMap& invalidation_map) {
+    const ObjectIdInvalidationMap& invalidation_map) {
   DCHECK(sync_loop_->task_runner()->BelongsToCurrentThread());
 
-  syncer::ObjectIdSet ids = invalidation_map.GetObjectIds();
+  ObjectIdSet ids = invalidation_map.GetObjectIds();
   for (const invalidation::ObjectId& object_id : ids) {
-    syncer::ModelType type;
+    ModelType type;
     if (!NotificationTypeToRealModelType(object_id.name(), &type)) {
       DLOG(WARNING) << "Notification has invalid id: "
-                    << syncer::ObjectIdToString(object_id);
+                    << ObjectIdToString(object_id);
     } else {
-      syncer::SingleObjectInvalidationSet invalidation_set =
+      SingleObjectInvalidationSet invalidation_set =
           invalidation_map.ForObject(object_id);
-      for (syncer::Invalidation invalidation : invalidation_set) {
+      for (Invalidation invalidation : invalidation_set) {
         auto last_invalidation = last_invalidation_versions_.find(type);
         if (!invalidation.is_unknown_version() &&
             last_invalidation != last_invalidation_versions_.end() &&
             invalidation.version() <= last_invalidation->second) {
           DVLOG(1) << "Ignoring redundant invalidation for "
-                   << syncer::ModelTypeToString(type) << " with version "
+                   << ModelTypeToString(type) << " with version "
                    << invalidation.version() << ", last seen version was "
                    << last_invalidation->second;
           continue;
         }
-        std::unique_ptr<syncer::InvalidationInterface> inv_adapter(
+        std::unique_ptr<InvalidationInterface> inv_adapter(
             new InvalidationAdapter(invalidation));
         sync_manager_->OnIncomingInvalidation(type, std::move(inv_adapter));
         if (!invalidation.is_unknown_version())
@@ -413,7 +405,7 @@ void SyncBackendHostCore::DoInitialize(
   sync_manager_ = options->sync_manager_factory->CreateSyncManager(name_);
   sync_manager_->AddObserver(this);
 
-  syncer::SyncManager::InitArgs args;
+  SyncManager::InitArgs args;
   args.database_location = sync_data_folder_path_;
   args.event_handler = options->event_handler;
   args.service_url = options->service_url;
@@ -438,7 +430,7 @@ void SyncBackendHostCore::DoInitialize(
 }
 
 void SyncBackendHostCore::DoUpdateCredentials(
-    const syncer::SyncCredentials& credentials) {
+    const SyncCredentials& credentials) {
   DCHECK(sync_loop_->task_runner()->BelongsToCurrentThread());
   // UpdateCredentials can be called during backend initialization, possibly
   // when backend initialization has failed but hasn't notified the UI thread
@@ -450,7 +442,7 @@ void SyncBackendHostCore::DoUpdateCredentials(
 }
 
 void SyncBackendHostCore::DoStartSyncing(
-    const syncer::ModelSafeRoutingInfo& routing_info,
+    const ModelSafeRoutingInfo& routing_info,
     base::Time last_poll_time) {
   DCHECK(sync_loop_->task_runner()->BelongsToCurrentThread());
   sync_manager_->StartSyncingNormally(routing_info, last_poll_time);
@@ -483,7 +475,7 @@ void SyncBackendHostCore::DoInitialProcessControlTypes() {
     return;
   }
 
-  if (!sync_manager_->InitialSyncEndedTypes().HasAll(syncer::ControlTypes())) {
+  if (!sync_manager_->InitialSyncEndedTypes().HasAll(ControlTypes())) {
     LOG(ERROR) << "Failed to download control types";
     host_.Call(FROM_HERE,
                &SyncBackendHostImpl::HandleInitializationFailureOnFrontendLoop);
@@ -532,21 +524,21 @@ void SyncBackendHostCore::ShutdownOnUIThread() {
   release_request_context_signal_.Signal();
 }
 
-void SyncBackendHostCore::DoShutdown(syncer::ShutdownReason reason) {
+void SyncBackendHostCore::DoShutdown(ShutdownReason reason) {
   DCHECK(sync_loop_->task_runner()->BelongsToCurrentThread());
 
   DoDestroySyncManager(reason);
 
   registrar_ = NULL;
 
-  if (reason == syncer::DISABLE_SYNC)
+  if (reason == DISABLE_SYNC)
     DeleteSyncDataFolder();
 
   host_.Reset();
   weak_ptr_factory_.InvalidateWeakPtrs();
 }
 
-void SyncBackendHostCore::DoDestroySyncManager(syncer::ShutdownReason reason) {
+void SyncBackendHostCore::DoDestroySyncManager(ShutdownReason reason) {
   DCHECK(sync_loop_->task_runner()->BelongsToCurrentThread());
   if (sync_manager_) {
     DisableDirectoryTypeDebugInfoForwarding();
@@ -558,11 +550,10 @@ void SyncBackendHostCore::DoDestroySyncManager(syncer::ShutdownReason reason) {
 }
 
 void SyncBackendHostCore::DoConfigureSyncer(
-    syncer::ConfigureReason reason,
+    ConfigureReason reason,
     const DoConfigureSyncerTypes& config_types,
-    const syncer::ModelSafeRoutingInfo routing_info,
-    const base::Callback<void(syncer::ModelTypeSet, syncer::ModelTypeSet)>&
-        ready_task,
+    const ModelSafeRoutingInfo routing_info,
+    const base::Callback<void(ModelTypeSet, ModelTypeSet)>& ready_task,
     const base::Closure& retry_callback) {
   DCHECK(sync_loop_->task_runner()->BelongsToCurrentThread());
   DCHECK(!ready_task.is_null());
@@ -580,20 +571,19 @@ void SyncBackendHostCore::DoConfigureSyncer(
 }
 
 void SyncBackendHostCore::DoFinishConfigureDataTypes(
-    syncer::ModelTypeSet types_to_config,
-    const base::Callback<void(syncer::ModelTypeSet, syncer::ModelTypeSet)>&
-        ready_task) {
+    ModelTypeSet types_to_config,
+    const base::Callback<void(ModelTypeSet, ModelTypeSet)>& ready_task) {
   DCHECK(sync_loop_->task_runner()->BelongsToCurrentThread());
 
   // Update the enabled types for the bridge and sync manager.
-  syncer::ModelSafeRoutingInfo routing_info;
+  ModelSafeRoutingInfo routing_info;
   registrar_->GetModelSafeRoutingInfo(&routing_info);
-  syncer::ModelTypeSet enabled_types = GetRoutingInfoTypes(routing_info);
-  enabled_types.RemoveAll(syncer::ProxyTypes());
+  ModelTypeSet enabled_types = GetRoutingInfoTypes(routing_info);
+  enabled_types.RemoveAll(ProxyTypes());
 
-  const syncer::ModelTypeSet failed_configuration_types =
+  const ModelTypeSet failed_configuration_types =
       Difference(types_to_config, sync_manager_->InitialSyncEndedTypes());
-  const syncer::ModelTypeSet succeeded_configuration_types =
+  const ModelTypeSet succeeded_configuration_types =
       Difference(types_to_config, failed_configuration_types);
   host_.Call(FROM_HERE,
              &SyncBackendHostImpl::FinishConfigureDataTypesOnFrontendLoop,
@@ -615,7 +605,7 @@ void SyncBackendHostCore::SendBufferedProtocolEventsAndEnableForwarding() {
   if (sync_manager_) {
     // Grab our own copy of the buffered events.
     // The buffer is not modified by this operation.
-    std::vector<std::unique_ptr<syncer::ProtocolEvent>> buffered_events =
+    std::vector<std::unique_ptr<ProtocolEvent>> buffered_events =
         sync_manager_->GetBufferedProtocolEvents();
 
     // Send them all over the fence to the host.
@@ -679,9 +669,9 @@ void SyncBackendHostCore::SaveChanges() {
 }
 
 void SyncBackendHostCore::DoClearServerData(
-    const syncer::SyncManager::ClearServerDataCallback& frontend_callback) {
+    const SyncManager::ClearServerDataCallback& frontend_callback) {
   DCHECK(sync_loop_->task_runner()->BelongsToCurrentThread());
-  const syncer::SyncManager::ClearServerDataCallback callback =
+  const SyncManager::ClearServerDataCallback callback =
       base::Bind(&SyncBackendHostCore::ClearServerDataDone,
                  weak_ptr_factory_.GetWeakPtr(), frontend_callback);
   sync_manager_->ClearServerData(callback);
@@ -700,4 +690,4 @@ void SyncBackendHostCore::ClearServerDataDone(
              frontend_callback);
 }
 
-}  // namespace browser_sync
+}  // namespace syncer