diff options
author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-02 23:37:21 +0000 |
---|---|---|
committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-02 23:37:21 +0000 |
commit | 11fbca0b619e6514dda96df6408b56c941000d98 (patch) | |
tree | 4f7d77839e5d250d1b5a4efbbf112c1e60141240 /net/socket | |
parent | 5c6ac84a3d364dccc6ef221b4370c76a95c93e2b (diff) | |
download | chromium_src-11fbca0b619e6514dda96df6408b56c941000d98.zip chromium_src-11fbca0b619e6514dda96df6408b56c941000d98.tar.gz chromium_src-11fbca0b619e6514dda96df6408b56c941000d98.tar.bz2 |
Update net/ to use WeakPtr<T>::get() instead of implicit "operator T*"
BUG=245942
Review URL: https://chromiumcodereview.appspot.com/15881011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203633 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
-rw-r--r-- | net/socket/socket_test_util.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc index a1e4d7c..a14ab2a 100644 --- a/net/socket/socket_test_util.cc +++ b/net/socket/socket_test_util.cc @@ -480,7 +480,8 @@ void DeterministicSocketData::Run() { } // We're done consuming new data, but it is possible there are still some // pending callbacks which we expect to complete before returning. - while (delegate_ && (delegate_->WritePending() || delegate_->ReadPending()) && + while (delegate_.get() && + (delegate_->WritePending() || delegate_->ReadPending()) && !stopped()) { InvokeCallbacks(); base::RunLoop().RunUntilIdle(); @@ -589,13 +590,13 @@ void DeterministicSocketData::Reset() { } void DeterministicSocketData::InvokeCallbacks() { - if (delegate_ && delegate_->WritePending() && + if (delegate_.get() && delegate_->WritePending() && (current_write().sequence_number == sequence_number())) { NextStep(); delegate_->CompleteWrite(); return; } - if (delegate_ && delegate_->ReadPending() && + if (delegate_.get() && delegate_->ReadPending() && (current_read().sequence_number == sequence_number())) { NextStep(); delegate_->CompleteRead(); |