diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-27 00:11:43 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-27 00:11:43 +0000 |
| commit | c80ec7e37d4c1fd2a49daf0ffb2a173d3dce6903 (patch) | |
| tree | d61631627c675b814616009506cdbc62981fd6a8 /sync/engine | |
| parent | 8119f8d3bfb0dfd69fc73d48fb853eabbcda6f67 (diff) | |
| download | chromium_src-c80ec7e37d4c1fd2a49daf0ffb2a173d3dce6903.zip chromium_src-c80ec7e37d4c1fd2a49daf0ffb2a173d3dce6903.tar.gz chromium_src-c80ec7e37d4c1fd2a49daf0ffb2a173d3dce6903.tar.bz2 | |
sync: Remove use of ALLOW_THIS_IN_INITIALIZER_LIST.
It's no longer providing value as the MSVC warning is disabled during compilation. Refer to bug for details.
BUG=234765
Review URL: https://chromiumcodereview.appspot.com/14335008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196892 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/engine')
| -rw-r--r-- | sync/engine/sync_scheduler_impl.cc | 4 | ||||
| -rw-r--r-- | sync/engine/sync_scheduler_unittest.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sync/engine/sync_scheduler_impl.cc b/sync/engine/sync_scheduler_impl.cc index 0fd7ac0..2b2a127 100644 --- a/sync/engine/sync_scheduler_impl.cc +++ b/sync/engine/sync_scheduler_impl.cc @@ -152,8 +152,8 @@ SyncSchedulerImpl::SyncSchedulerImpl(const std::string& name, BackoffDelayProvider* delay_provider, sessions::SyncSessionContext* context, Syncer* syncer) - : weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), - weak_ptr_factory_for_weak_handle_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), + : weak_ptr_factory_(this), + weak_ptr_factory_for_weak_handle_(this), weak_handle_this_(MakeWeakHandle( weak_ptr_factory_for_weak_handle_.GetWeakPtr())), name_(name), diff --git a/sync/engine/sync_scheduler_unittest.cc b/sync/engine/sync_scheduler_unittest.cc index a890117..ffb2e57 100644 --- a/sync/engine/sync_scheduler_unittest.cc +++ b/sync/engine/sync_scheduler_unittest.cc @@ -93,7 +93,7 @@ static const size_t kMinNumSamples = 5; class SyncSchedulerTest : public testing::Test { public: SyncSchedulerTest() - : weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), + : weak_ptr_factory_(this), context_(NULL), syncer_(NULL), delay_(NULL) {} |