Index: components/sync/driver/data_type_status_table.cc |
diff --git a/components/sync_driver/data_type_status_table.cc b/components/sync/driver/data_type_status_table.cc |
similarity index 93% |
rename from components/sync_driver/data_type_status_table.cc |
rename to components/sync/driver/data_type_status_table.cc |
index 666b7b485fc93e3a140e9ded863144a9e999145e..85d5a2b7b1a941d0e8d3ad55e089effbfe501cf0 100644 |
--- a/components/sync_driver/data_type_status_table.cc |
+++ b/components/sync/driver/data_type_status_table.cc |
@@ -2,8 +2,8 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "components/sync_driver/data_type_manager.h" |
-#include "components/sync_driver/data_type_status_table.h" |
+#include "components/sync/driver/data_type_manager.h" |
+#include "components/sync/driver/data_type_status_table.h" |
namespace sync_driver { |
@@ -22,14 +22,12 @@ syncer::ModelTypeSet GetTypesFromErrorMap( |
} // namespace |
-DataTypeStatusTable::DataTypeStatusTable() { |
-} |
+DataTypeStatusTable::DataTypeStatusTable() {} |
DataTypeStatusTable::DataTypeStatusTable(const DataTypeStatusTable& other) = |
default; |
-DataTypeStatusTable::~DataTypeStatusTable() { |
-} |
+DataTypeStatusTable::~DataTypeStatusTable() {} |
void DataTypeStatusTable::UpdateFailedDataTypes(const TypeErrorMap& errors) { |
DVLOG(1) << "Setting " << errors.size() << " new failed types."; |
@@ -90,8 +88,7 @@ bool DataTypeStatusTable::ResetUnreadyErrorFor(syncer::ModelType type) { |
return unready_errors_.erase(type) > 0; |
} |
-DataTypeStatusTable::TypeErrorMap DataTypeStatusTable::GetAllErrors() |
- const { |
+DataTypeStatusTable::TypeErrorMap DataTypeStatusTable::GetAllErrors() const { |
TypeErrorMap result; |
result.insert(data_type_errors_.begin(), data_type_errors_.end()); |
result.insert(crypto_errors_.begin(), crypto_errors_.end()); |
@@ -108,8 +105,7 @@ syncer::ModelTypeSet DataTypeStatusTable::GetFailedTypes() const { |
return result; |
} |
-syncer::ModelTypeSet DataTypeStatusTable::GetFatalErrorTypes() |
- const { |
+syncer::ModelTypeSet DataTypeStatusTable::GetFatalErrorTypes() const { |
syncer::ModelTypeSet result; |
result.PutAll(GetTypesFromErrorMap(data_type_errors_)); |
result.PutAll(GetTypesFromErrorMap(unrecoverable_errors_)); |
@@ -131,8 +127,7 @@ syncer::ModelTypeSet DataTypeStatusTable::GetUnreadyErrorTypes() const { |
return result; |
} |
-syncer::ModelTypeSet DataTypeStatusTable::GetUnrecoverableErrorTypes() |
- const { |
+syncer::ModelTypeSet DataTypeStatusTable::GetUnrecoverableErrorTypes() const { |
syncer::ModelTypeSet result = GetTypesFromErrorMap(unrecoverable_errors_); |
return result; |
} |