Index: components/sync/api/sync_merge_result.cc |
diff --git a/sync/api/sync_merge_result.cc b/components/sync/api/sync_merge_result.cc |
similarity index 84% |
rename from sync/api/sync_merge_result.cc |
rename to components/sync/api/sync_merge_result.cc |
index f5607c7a1698cd17869272f77c7df914725a8e1e..0f68653f90649dfe1481b954a27e2229491d70b5 100644 |
--- a/sync/api/sync_merge_result.cc |
+++ b/components/sync/api/sync_merge_result.cc |
@@ -4,24 +4,22 @@ |
#include <stdint.h> |
-#include "sync/api/sync_merge_result.h" |
+#include "components/sync/api/sync_merge_result.h" |
namespace syncer { |
SyncMergeResult::SyncMergeResult(ModelType type) |
- : model_type_(type), |
- num_items_before_association_(0), |
- num_items_after_association_(0), |
- num_items_added_(0), |
- num_items_deleted_(0), |
- num_items_modified_(0), |
- pre_association_version_(0) { |
-} |
+ : model_type_(type), |
+ num_items_before_association_(0), |
+ num_items_after_association_(0), |
+ num_items_added_(0), |
+ num_items_deleted_(0), |
+ num_items_modified_(0), |
+ pre_association_version_(0) {} |
SyncMergeResult::SyncMergeResult(const SyncMergeResult& other) = default; |
-SyncMergeResult::~SyncMergeResult() { |
-} |
+SyncMergeResult::~SyncMergeResult() {} |
// Setters. |
void SyncMergeResult::set_error(SyncError error) { |
@@ -30,7 +28,7 @@ void SyncMergeResult::set_error(SyncError error) { |
} |
void SyncMergeResult::set_num_items_before_association( |
- int num_items_before_association) { |
+ int num_items_before_association) { |
num_items_before_association_ = num_items_before_association; |
} |