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

Unified Diff: components/sync/driver/fake_data_type_controller.cc

Issue 2203673002: [Sync] Move //components/sync_driver to //components/sync/driver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@sd-a
Patch Set: Full change rebased on static lib. Created 4 years, 4 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
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
similarity index 86%
rename from components/sync_driver/fake_data_type_controller.cc
rename to components/sync/driver/fake_data_type_controller.cc
index 18c02ca138dfe015d78850f6ff7a36a73614dfa0..38159a80aacd10dfc6a9e4c6791157b13785692e 100644
--- a/components/sync_driver/fake_data_type_controller.cc
+++ b/components/sync/driver/fake_data_type_controller.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "components/sync_driver/fake_data_type_controller.h"
+#include "components/sync/driver/fake_data_type_controller.h"
#include "base/threading/thread_task_runner_handle.h"
#include "components/sync/api/sync_merge_result.h"
@@ -23,8 +23,7 @@ FakeDataTypeController::FakeDataTypeController(ModelType type)
should_load_model_before_configure_(false),
register_with_backend_call_count_(0) {}
-FakeDataTypeController::~FakeDataTypeController() {
-}
+FakeDataTypeController::~FakeDataTypeController() {}
bool FakeDataTypeController::ShouldLoadModelBeforeConfigure() const {
return should_load_model_before_configure_;
@@ -79,24 +78,17 @@ void FakeDataTypeController::FinishStart(ConfigureResult result) {
} else if (result == ASSOCIATION_FAILED) {
state_ = DISABLED;
local_merge_result.set_error(
- syncer::SyncError(FROM_HERE,
- syncer::SyncError::DATATYPE_ERROR,
- "Association failed",
- type()));
+ syncer::SyncError(FROM_HERE, syncer::SyncError::DATATYPE_ERROR,
+ "Association failed", type()));
} else if (result == UNRECOVERABLE_ERROR) {
state_ = NOT_RUNNING;
local_merge_result.set_error(
- syncer::SyncError(FROM_HERE,
- syncer::SyncError::UNRECOVERABLE_ERROR,
- "Unrecoverable error",
- type()));
+ syncer::SyncError(FROM_HERE, syncer::SyncError::UNRECOVERABLE_ERROR,
+ "Unrecoverable error", type()));
} else if (result == NEEDS_CRYPTO) {
state_ = NOT_RUNNING;
- local_merge_result.set_error(
- syncer::SyncError(FROM_HERE,
- syncer::SyncError::CRYPTO_ERROR,
- "Crypto error",
- type()));
+ local_merge_result.set_error(syncer::SyncError(
+ FROM_HERE, syncer::SyncError::CRYPTO_ERROR, "Crypto error", type()));
} else {
NOTREACHED();
}
« no previous file with comments | « components/sync/driver/fake_data_type_controller.h ('k') | components/sync/driver/fake_generic_change_processor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698