diff options
| author | mohan.reddy <mohan.reddy@samsung.com> | 2014-09-07 23:51:43 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-08 06:57:52 +0000 |
| commit | 0e6caf9065d630ef1155a4b1034a725c72fb13c6 (patch) | |
| tree | fbfd078c3903a001affa1186825d5d106e2e6573 /sync | |
| parent | 9d31d5191dfca9be7bec3e128fad130def533b60 (diff) | |
| download | chromium_src-0e6caf9065d630ef1155a4b1034a725c72fb13c6.zip chromium_src-0e6caf9065d630ef1155a4b1034a725c72fb13c6.tar.gz chromium_src-0e6caf9065d630ef1155a4b1034a725c72fb13c6.tar.bz2 | |
Changing the order of weak_ptr_factory in src/sync module, to ensure proper cleanup while object is inactive.
BUG=303818
Review URL: https://codereview.chromium.org/509853003
Cr-Commit-Position: refs/heads/master@{#293678}
Diffstat (limited to 'sync')
| -rw-r--r-- | sync/internal_api/sync_rollback_manager_base.cc | 4 | ||||
| -rw-r--r-- | sync/internal_api/sync_rollback_manager_base.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sync/internal_api/sync_rollback_manager_base.cc b/sync/internal_api/sync_rollback_manager_base.cc index a2f14e4..dc314b0 100644 --- a/sync/internal_api/sync_rollback_manager_base.cc +++ b/sync/internal_api/sync_rollback_manager_base.cc @@ -41,9 +41,9 @@ namespace syncer { SyncRollbackManagerBase::SyncRollbackManagerBase() : report_unrecoverable_error_function_(NULL), - weak_ptr_factory_(this), dummy_handler_(new DummyEntryptionHandler), - initialized_(false) { + initialized_(false), + weak_ptr_factory_(this) { } SyncRollbackManagerBase::~SyncRollbackManagerBase() { diff --git a/sync/internal_api/sync_rollback_manager_base.h b/sync/internal_api/sync_rollback_manager_base.h index b92cafb..63aafc4 100644 --- a/sync/internal_api/sync_rollback_manager_base.h +++ b/sync/internal_api/sync_rollback_manager_base.h @@ -133,12 +133,12 @@ class SYNC_EXPORT_PRIVATE SyncRollbackManagerBase : scoped_ptr<UnrecoverableErrorHandler> unrecoverable_error_handler_; ReportUnrecoverableErrorFunction report_unrecoverable_error_function_; - base::WeakPtrFactory<SyncRollbackManagerBase> weak_ptr_factory_; - scoped_ptr<SyncEncryptionHandler> dummy_handler_; bool initialized_; + base::WeakPtrFactory<SyncRollbackManagerBase> weak_ptr_factory_; + DISALLOW_COPY_AND_ASSIGN(SyncRollbackManagerBase); }; |