| Index: chrome/browser/sync/glue/frontend_data_type_controller.cc
|
| diff --git a/chrome/browser/sync/glue/frontend_data_type_controller.cc b/chrome/browser/sync/glue/frontend_data_type_controller.cc
|
| index 14d55e283b8ee1602ec33ca3b49c6ea3076b5c63..8478b71535b6f533adc35ceeaf7118919c9545bc 100644
|
| --- a/chrome/browser/sync/glue/frontend_data_type_controller.cc
|
| +++ b/chrome/browser/sync/glue/frontend_data_type_controller.cc
|
| @@ -40,7 +40,7 @@ void FrontendDataTypeController::LoadModels(
|
| DCHECK(!model_load_callback.is_null());
|
|
|
| if (state_ != NOT_RUNNING) {
|
| - model_load_callback.Run(type(), SyncError(FROM_HERE,
|
| + model_load_callback.Run(type(), csync::SyncError(FROM_HERE,
|
| "Model already running",
|
| type()));
|
| return;
|
| @@ -69,7 +69,7 @@ void FrontendDataTypeController::OnModelLoaded() {
|
| state_ = MODEL_LOADED;
|
| ModelLoadCallback model_load_callback = model_load_callback_;
|
| model_load_callback_.Reset();
|
| - model_load_callback.Run(type(), SyncError());
|
| + model_load_callback.Run(type(), csync::SyncError());
|
| }
|
|
|
| void FrontendDataTypeController::StartAssociating(
|
| @@ -110,7 +110,7 @@ void FrontendDataTypeController::Stop() {
|
| sync_service_->DeactivateDataType(type());
|
|
|
| if (model_associator()) {
|
| - SyncError error; // Not used.
|
| + csync::SyncError error; // Not used.
|
| error = model_associator()->DisassociateModels();
|
| }
|
|
|
| @@ -162,19 +162,19 @@ bool FrontendDataTypeController::Associate() {
|
| DCHECK_EQ(state_, ASSOCIATING);
|
| CreateSyncComponents();
|
| if (!model_associator()->CryptoReadyIfNecessary()) {
|
| - StartFailed(NEEDS_CRYPTO, SyncError());
|
| + StartFailed(NEEDS_CRYPTO, csync::SyncError());
|
| return false;
|
| }
|
|
|
| bool sync_has_nodes = false;
|
| if (!model_associator()->SyncModelHasUserCreatedNodes(&sync_has_nodes)) {
|
| - SyncError error(FROM_HERE, "Failed to load sync nodes", type());
|
| + csync::SyncError error(FROM_HERE, "Failed to load sync nodes", type());
|
| StartFailed(UNRECOVERABLE_ERROR, error);
|
| return false;
|
| }
|
|
|
| base::TimeTicks start_time = base::TimeTicks::Now();
|
| - SyncError error;
|
| + csync::SyncError error;
|
| error = model_associator()->AssociateModels();
|
| // TODO(lipalani): crbug.com/122690 - handle abort.
|
| RecordAssociationTime(base::TimeTicks::Now() - start_time);
|
| @@ -209,7 +209,7 @@ void FrontendDataTypeController::CleanUp() {
|
| }
|
|
|
| void FrontendDataTypeController::StartFailed(StartResult result,
|
| - const SyncError& error) {
|
| + const csync::SyncError& error) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
|
|
| if (IsUnrecoverableResult(result))
|
| @@ -237,7 +237,7 @@ void FrontendDataTypeController::AbortModelLoad() {
|
| state_ = NOT_RUNNING;
|
| ModelLoadCallback model_load_callback = model_load_callback_;
|
| model_load_callback_.Reset();
|
| - model_load_callback.Run(type(), SyncError(FROM_HERE,
|
| + model_load_callback.Run(type(), csync::SyncError(FROM_HERE,
|
| "Aborted",
|
| type()));
|
| }
|
| @@ -250,7 +250,7 @@ void FrontendDataTypeController::FinishStart(StartResult result) {
|
| // confused by the non-NULL start_callback_.
|
| StartCallback callback = start_callback_;
|
| start_callback_.Reset();
|
| - callback.Run(result, SyncError());
|
| + callback.Run(result, csync::SyncError());
|
| }
|
|
|
| void FrontendDataTypeController::RecordAssociationTime(base::TimeDelta time) {
|
|
|