| Index: chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc
|
| diff --git a/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc b/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc
|
| index 726520f7bef0f33a43775de8019f6cd84cec816c..a8857726e142dd83ffe66196cd50e1103dcc1585 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc
|
| +++ b/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc
|
| @@ -23,11 +23,9 @@ namespace drive_backend {
|
|
|
| ConflictResolver::ConflictResolver(SyncEngineContext* sync_context)
|
| : sync_context_(sync_context),
|
| - weak_ptr_factory_(this) {
|
| -}
|
| + weak_ptr_factory_(this) {}
|
|
|
| -ConflictResolver::~ConflictResolver() {
|
| -}
|
| +ConflictResolver::~ConflictResolver() {}
|
|
|
| void ConflictResolver::RunSequential(const SyncStatusCallback& callback) {
|
| if (!IsContextReady()) {
|
|
|