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/notifier | |
| 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/notifier')
| -rw-r--r-- | sync/notifier/non_blocking_invalidator.cc | 2 | ||||
| -rw-r--r-- | sync/notifier/sync_invalidation_listener.cc | 7 | ||||
| -rw-r--r-- | sync/notifier/sync_system_resources.cc | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/sync/notifier/non_blocking_invalidator.cc b/sync/notifier/non_blocking_invalidator.cc index d366e31..a67b196 100644 --- a/sync/notifier/non_blocking_invalidator.cc +++ b/sync/notifier/non_blocking_invalidator.cc @@ -141,7 +141,7 @@ NonBlockingInvalidator::NonBlockingInvalidator( const WeakHandle<InvalidationStateTracker>& invalidation_state_tracker, const std::string& client_info) - : weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), + : weak_ptr_factory_(this), core_( new Core(MakeWeakHandle(weak_ptr_factory_.GetWeakPtr()))), parent_task_runner_( diff --git a/sync/notifier/sync_invalidation_listener.cc b/sync/notifier/sync_invalidation_listener.cc index 44faac5..8d39755 100644 --- a/sync/notifier/sync_invalidation_listener.cc +++ b/sync/notifier/sync_invalidation_listener.cc @@ -31,11 +31,10 @@ SyncInvalidationListener::Delegate::~Delegate() {} SyncInvalidationListener::SyncInvalidationListener( base::TickClock* tick_clock, scoped_ptr<notifier::PushClient> push_client) - : weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), - ack_tracker_(tick_clock, ALLOW_THIS_IN_INITIALIZER_LIST(this)), + : weak_ptr_factory_(this), + ack_tracker_(tick_clock, this), push_client_(push_client.get()), - sync_system_resources_(push_client.Pass(), - ALLOW_THIS_IN_INITIALIZER_LIST(this)), + sync_system_resources_(push_client.Pass(), this), delegate_(NULL), ticl_state_(DEFAULT_INVALIDATION_ERROR), push_client_state_(DEFAULT_INVALIDATION_ERROR) { diff --git a/sync/notifier/sync_system_resources.cc b/sync/notifier/sync_system_resources.cc index 3fc31fc..386bffe 100644 --- a/sync/notifier/sync_system_resources.cc +++ b/sync/notifier/sync_system_resources.cc @@ -61,7 +61,7 @@ void SyncLogger::SetSystemResources(invalidation::SystemResources* resources) { } SyncInvalidationScheduler::SyncInvalidationScheduler() - : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), + : weak_factory_(this), created_on_loop_(MessageLoop::current()), is_started_(false), is_stopped_(false) { |