Index: components/sync/driver/proxy_data_type_controller.cc |
diff --git a/components/sync_driver/proxy_data_type_controller.cc b/components/sync/driver/proxy_data_type_controller.cc |
similarity index 90% |
rename from components/sync_driver/proxy_data_type_controller.cc |
rename to components/sync/driver/proxy_data_type_controller.cc |
index b0e382446bc45de0226b34984d7822e6bc95d749..99c74b78c856366553531f3c283eedf70a852041 100644 |
--- a/components/sync_driver/proxy_data_type_controller.cc |
+++ b/components/sync/driver/proxy_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/proxy_data_type_controller.h" |
+#include "components/sync/driver/proxy_data_type_controller.h" |
#include "components/sync/api/sync_merge_result.h" |
@@ -17,8 +17,7 @@ ProxyDataTypeController::ProxyDataTypeController( |
DCHECK(syncer::ProxyTypes().Has(type_)); |
} |
-ProxyDataTypeController::~ProxyDataTypeController() { |
-} |
+ProxyDataTypeController::~ProxyDataTypeController() {} |
bool ProxyDataTypeController::ShouldLoadModelBeforeConfigure() const { |
return false; |
@@ -38,8 +37,7 @@ void ProxyDataTypeController::StartAssociating( |
syncer::SyncMergeResult local_merge_result(type_); |
syncer::SyncMergeResult syncer_merge_result(type_); |
state_ = RUNNING; |
- start_callback.Run(DataTypeController::OK, |
- local_merge_result, |
+ start_callback.Run(DataTypeController::OK, local_merge_result, |
syncer_merge_result); |
} |