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

components/sync/driver/frontend_data_type_controller.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 "components/sync/driver/frontend_data_type_controller.h"
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/sync/api/data_type_error_handler_impl.h"
 #include "components/sync/api/sync_error.h"
 #include "components/sync/api/sync_merge_result.h"
 #include "components/sync/base/data_type_histogram.h"
 #include "components/sync/base/model_type.h"
 #include "components/sync/driver/change_processor.h"
 #include "components/sync/driver/model_associator.h"
 #include "components/sync/driver/sync_client.h"
 #include "components/sync/driver/sync_service.h"
 
-namespace browser_sync {
+namespace syncer {
 
 FrontendDataTypeController::FrontendDataTypeController(
-    syncer::ModelType type,
+    ModelType type,
     const base::Closure& dump_stack,
-    sync_driver::SyncClient* sync_client)
+    SyncClient* sync_client)
     : DirectoryDataTypeController(type, dump_stack, sync_client),
       state_(NOT_RUNNING) {
   DCHECK(CalledOnValidThread());
   DCHECK(sync_client);
 }
 
 void FrontendDataTypeController::LoadModels(
     const ModelLoadCallback& model_load_callback) {
   DCHECK(CalledOnValidThread());
   model_load_callback_ = model_load_callback;
 
   if (state_ != NOT_RUNNING) {
-    model_load_callback.Run(
-        type(), syncer::SyncError(FROM_HERE, syncer::SyncError::DATATYPE_ERROR,
-                                  "Model already running", type()));
+    model_load_callback.Run(type(),
+                            SyncError(FROM_HERE, SyncError::DATATYPE_ERROR,
+                                      "Model already running", type()));
     return;
   }
 
   state_ = MODEL_STARTING;
   if (!StartModels()) {
     // If we are waiting for some external service to load before associating
     // or we failed to start the models, we exit early. state_ will control
     // what we perform next.
     DCHECK(state_ == NOT_RUNNING || state_ == MODEL_STARTING);
     return;
   }
 
   OnModelLoaded();
 }
 
 void FrontendDataTypeController::OnModelLoaded() {
   DCHECK(CalledOnValidThread());
   DCHECK_EQ(state_, MODEL_STARTING);
 
   state_ = MODEL_LOADED;
-  model_load_callback_.Run(type(), syncer::SyncError());
+  model_load_callback_.Run(type(), SyncError());
 }
 
 void FrontendDataTypeController::StartAssociating(
     const StartCallback& start_callback) {
   DCHECK(CalledOnValidThread());
   DCHECK(!start_callback.is_null());
   DCHECK_EQ(state_, MODEL_LOADED);
 
   start_callback_ = start_callback;
   state_ = ASSOCIATING;
@@ skipping 17 matching lines @@
   if (prev_state == MODEL_STARTING) {
     AbortModelLoad();
     // We can just return here since we haven't performed association if we're
     // still in MODEL_STARTING.
     return;
   }
 
   CleanUpState();
 
   if (model_associator()) {
-    syncer::SyncError error;  // Not used.
+    SyncError error;  // Not used.
     error = model_associator()->DisassociateModels();
   }
 
   set_model_associator(NULL);
   change_processor_.reset();
 
   state_ = NOT_RUNNING;
 }
 
-syncer::ModelSafeGroup FrontendDataTypeController::model_safe_group() const {
-  return syncer::GROUP_UI;
+ModelSafeGroup FrontendDataTypeController::model_safe_group() const {
+  return GROUP_UI;
 }
 
 std::string FrontendDataTypeController::name() const {
   // For logging only.
-  return syncer::ModelTypeToString(type());
+  return ModelTypeToString(type());
 }
 
-sync_driver::DataTypeController::State FrontendDataTypeController::state()
-    const {
+DataTypeController::State FrontendDataTypeController::state() const {
   return state_;
 }
 
 FrontendDataTypeController::FrontendDataTypeController()
-    : DirectoryDataTypeController(syncer::UNSPECIFIED,
-                                  base::Closure(),
-                                  nullptr),
+    : DirectoryDataTypeController(UNSPECIFIED, base::Closure(), nullptr),
       state_(NOT_RUNNING) {}
 
 FrontendDataTypeController::~FrontendDataTypeController() {}
 
 bool FrontendDataTypeController::StartModels() {
   DCHECK(CalledOnValidThread());
   DCHECK_EQ(state_, MODEL_STARTING);
   // By default, no additional services need to be started before we can proceed
   // with model association.
   return true;
 }
 
 void FrontendDataTypeController::Associate() {
   DCHECK(CalledOnValidThread());
   if (state_ != ASSOCIATING) {
     // Stop() must have been called while Associate() task have been waiting.
     DCHECK_EQ(state_, NOT_RUNNING);
     return;
   }
 
-  syncer::SyncMergeResult local_merge_result(type());
-  syncer::SyncMergeResult syncer_merge_result(type());
+  SyncMergeResult local_merge_result(type());
+  SyncMergeResult syncer_merge_result(type());
   CreateSyncComponents();
   if (!model_associator()->CryptoReadyIfNecessary()) {
     StartDone(NEEDS_CRYPTO, local_merge_result, syncer_merge_result);
     return;
   }
 
   bool sync_has_nodes = false;
   if (!model_associator()->SyncModelHasUserCreatedNodes(&sync_has_nodes)) {
-    syncer::SyncError error(FROM_HERE, syncer::SyncError::UNRECOVERABLE_ERROR,
-                            "Failed to load sync nodes", type());
+    SyncError error(FROM_HERE, SyncError::UNRECOVERABLE_ERROR,
+                    "Failed to load sync nodes", type());
     local_merge_result.set_error(error);
     StartDone(UNRECOVERABLE_ERROR, local_merge_result, syncer_merge_result);
     return;
   }
 
   // TODO(zea): Have AssociateModels fill the local and syncer merge results.
   base::TimeTicks start_time = base::TimeTicks::Now();
-  syncer::SyncError error;
+  SyncError error;
   error = model_associator()->AssociateModels(&local_merge_result,
                                               &syncer_merge_result);
   // TODO(lipalani): crbug.com/122690 - handle abort.
   RecordAssociationTime(base::TimeTicks::Now() - start_time);
   if (error.IsSet()) {
     local_merge_result.set_error(error);
     StartDone(ASSOCIATION_FAILED, local_merge_result, syncer_merge_result);
     return;
   }
 
@@ skipping 16 matching lines @@
 }
 
 void FrontendDataTypeController::AbortModelLoad() {
   DCHECK(CalledOnValidThread());
   CleanUp();
   state_ = NOT_RUNNING;
 }
 
 void FrontendDataTypeController::StartDone(
     ConfigureResult start_result,
-    const syncer::SyncMergeResult& local_merge_result,
-    const syncer::SyncMergeResult& syncer_merge_result) {
+    const SyncMergeResult& local_merge_result,
+    const SyncMergeResult& syncer_merge_result) {
   DCHECK(CalledOnValidThread());
   if (!IsSuccessfulResult(start_result)) {
     CleanUp();
     if (start_result == ASSOCIATION_FAILED) {
       state_ = DISABLED;
     } else {
       state_ = NOT_RUNNING;
     }
     RecordStartFailure(start_result);
   }
 
   start_callback_.Run(start_result, local_merge_result, syncer_merge_result);
 }
 
-std::unique_ptr<syncer::DataTypeErrorHandler>
+std::unique_ptr<DataTypeErrorHandler>
 FrontendDataTypeController::CreateErrorHandler() {
-  return base::MakeUnique<syncer::DataTypeErrorHandlerImpl>(
+  return base::MakeUnique<DataTypeErrorHandlerImpl>(
       base::ThreadTaskRunnerHandle::Get(), dump_stack_,
       base::Bind(&FrontendDataTypeController::OnUnrecoverableError,
                  base::AsWeakPtr(this)));
 }
 
-void FrontendDataTypeController::OnUnrecoverableError(
-    const syncer::SyncError& error) {
+void FrontendDataTypeController::OnUnrecoverableError(const SyncError& error) {
   DCHECK(CalledOnValidThread());
   DCHECK_EQ(type(), error.model_type());
   if (!model_load_callback_.is_null()) {
     model_load_callback_.Run(type(), error);
   }
 }
 
 void FrontendDataTypeController::RecordAssociationTime(base::TimeDelta time) {
   DCHECK(CalledOnValidThread());
 #define PER_DATA_TYPE_MACRO(type_str) \
   UMA_HISTOGRAM_TIMES("Sync." type_str "AssociationTime", time);
   SYNC_DATA_TYPE_HISTOGRAM(type());
 #undef PER_DATA_TYPE_MACRO
 }
 
 void FrontendDataTypeController::RecordStartFailure(ConfigureResult result) {
   DCHECK(CalledOnValidThread());
   UMA_HISTOGRAM_ENUMERATION("Sync.DataTypeStartFailures",
-                            ModelTypeToHistogramInt(type()),
-                            syncer::MODEL_TYPE_COUNT);
+                            ModelTypeToHistogramInt(type()), MODEL_TYPE_COUNT);
 #define PER_DATA_TYPE_MACRO(type_str)                                    \
   UMA_HISTOGRAM_ENUMERATION("Sync." type_str "ConfigureFailure", result, \
                             MAX_CONFIGURE_RESULT);
   SYNC_DATA_TYPE_HISTOGRAM(type());
 #undef PER_DATA_TYPE_MACRO
 }
 
-sync_driver::AssociatorInterface* FrontendDataTypeController::model_associator()
-    const {
+AssociatorInterface* FrontendDataTypeController::model_associator() const {
   return model_associator_.get();
 }
 
 void FrontendDataTypeController::set_model_associator(
-    sync_driver::AssociatorInterface* model_associator) {
+    AssociatorInterface* model_associator) {
   model_associator_.reset(model_associator);
 }
 
-sync_driver::ChangeProcessor* FrontendDataTypeController::GetChangeProcessor()
-    const {
+ChangeProcessor* FrontendDataTypeController::GetChangeProcessor() const {
   return change_processor_.get();
 }
 
 void FrontendDataTypeController::set_change_processor(
-    sync_driver::ChangeProcessor* change_processor) {
+    ChangeProcessor* change_processor) {
   change_processor_.reset(change_processor);
 }
 
-}  // namespace browser_sync
+}  // namespace syncer