Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(63)

Unified Diff: components/sync_driver/fake_data_type_controller.cc

Issue 534733002: Revert "[Sync] Move DataTypeStatusTable ownership into DataTypeManager." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/sync_driver/data_type_status_table.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync_driver/fake_data_type_controller.cc
diff --git a/components/sync_driver/fake_data_type_controller.cc b/components/sync_driver/fake_data_type_controller.cc
index 3fb646c51644427a010f8dce3d750c9db04ff6ef..9f9c7693f5d8e184dd7be80fa5f31c01de0b9944 100644
--- a/components/sync_driver/fake_data_type_controller.cc
+++ b/components/sync_driver/fake_data_type_controller.cc
@@ -80,15 +80,13 @@ void FakeDataTypeController::FinishStart(ConfigureResult result) {
syncer::SyncError::UNRECOVERABLE_ERROR,
"Unrecoverable error",
type()));
- } else if (result == NEEDS_CRYPTO) {
+ } else {
state_ = NOT_RUNNING;
local_merge_result.set_error(
syncer::SyncError(FROM_HERE,
- syncer::SyncError::CRYPTO_ERROR,
- "Crypto error",
+ syncer::SyncError::DATATYPE_ERROR,
+ "Fake error",
type()));
- } else {
- NOTREACHED();
}
last_start_callback_.Run(result, local_merge_result, syncer_merge_result);
}
« no previous file with comments | « components/sync_driver/data_type_status_table.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698