Commit 0e6caf90 authored by mohan.reddy's avatar mohan.reddy Committed by Commit bot

Changing the order of weak_ptr_factory in src/sync module, to ensure proper...

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}
parent 9d31d519
...@@ -296,6 +296,7 @@ Miyoung Shin <myid.shin@samsung.com> ...@@ -296,6 +296,7 @@ Miyoung Shin <myid.shin@samsung.com>
Mohamed I. Hammad <ibraaaa@gmail.com> Mohamed I. Hammad <ibraaaa@gmail.com>
Mohamed Mansour <m0.interactive@gmail.com> Mohamed Mansour <m0.interactive@gmail.com>
Mohammed Wajahat Ali Siddiqui <wajahat.s@samsung.com> Mohammed Wajahat Ali Siddiqui <wajahat.s@samsung.com>
Mohan Reddy <mohan.reddy@samsung.com>
Mrunal Kapade <mrunal.kapade@intel.com> Mrunal Kapade <mrunal.kapade@intel.com>
Myles C. Maxfield <mymax@amazon.com> Myles C. Maxfield <mymax@amazon.com>
Naiem Shaik <naiem.shaik@gmail.com> Naiem Shaik <naiem.shaik@gmail.com>
......
...@@ -41,9 +41,9 @@ namespace syncer { ...@@ -41,9 +41,9 @@ namespace syncer {
SyncRollbackManagerBase::SyncRollbackManagerBase() SyncRollbackManagerBase::SyncRollbackManagerBase()
: report_unrecoverable_error_function_(NULL), : report_unrecoverable_error_function_(NULL),
weak_ptr_factory_(this),
dummy_handler_(new DummyEntryptionHandler), dummy_handler_(new DummyEntryptionHandler),
initialized_(false) { initialized_(false),
weak_ptr_factory_(this) {
} }
SyncRollbackManagerBase::~SyncRollbackManagerBase() { SyncRollbackManagerBase::~SyncRollbackManagerBase() {
......
...@@ -133,12 +133,12 @@ class SYNC_EXPORT_PRIVATE SyncRollbackManagerBase : ...@@ -133,12 +133,12 @@ class SYNC_EXPORT_PRIVATE SyncRollbackManagerBase :
scoped_ptr<UnrecoverableErrorHandler> unrecoverable_error_handler_; scoped_ptr<UnrecoverableErrorHandler> unrecoverable_error_handler_;
ReportUnrecoverableErrorFunction report_unrecoverable_error_function_; ReportUnrecoverableErrorFunction report_unrecoverable_error_function_;
base::WeakPtrFactory<SyncRollbackManagerBase> weak_ptr_factory_;
scoped_ptr<SyncEncryptionHandler> dummy_handler_; scoped_ptr<SyncEncryptionHandler> dummy_handler_;
bool initialized_; bool initialized_;
base::WeakPtrFactory<SyncRollbackManagerBase> weak_ptr_factory_;
DISALLOW_COPY_AND_ASSIGN(SyncRollbackManagerBase); DISALLOW_COPY_AND_ASSIGN(SyncRollbackManagerBase);
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment