diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-24 20:45:16 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-24 20:45:16 +0000 |
| commit | 6f09fe88f0eb5fce4ecd72454442e7d2e6973c95 (patch) | |
| tree | 6c4a2064726709e31f9b8774a0e1ac5ab5edce39 /webkit/media | |
| parent | ac115ce69f13d5a25cac752b9e761198be478d51 (diff) | |
| download | chromium_src-6f09fe88f0eb5fce4ecd72454442e7d2e6973c95.zip chromium_src-6f09fe88f0eb5fce4ecd72454442e7d2e6973c95.tar.gz chromium_src-6f09fe88f0eb5fce4ecd72454442e7d2e6973c95.tar.bz2 | |
media: 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/13843027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196227 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media')
| -rw-r--r-- | webkit/media/crypto/ppapi_decryptor.cc | 2 | ||||
| -rw-r--r-- | webkit/media/crypto/proxy_decryptor.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/webkit/media/crypto/ppapi_decryptor.cc b/webkit/media/crypto/ppapi_decryptor.cc index 7b9c334..7f45178 100644 --- a/webkit/media/crypto/ppapi_decryptor.cc +++ b/webkit/media/crypto/ppapi_decryptor.cc @@ -36,7 +36,7 @@ PpapiDecryptor::PpapiDecryptor( need_key_cb_(need_key_cb), plugin_cdm_delegate_(NULL), render_loop_proxy_(base::MessageLoopProxy::current()), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)), + weak_ptr_factory_(this), weak_this_(weak_ptr_factory_.GetWeakPtr()) { DCHECK(plugin_instance_); } diff --git a/webkit/media/crypto/proxy_decryptor.cc b/webkit/media/crypto/proxy_decryptor.cc index dafc955..866b88c 100644 --- a/webkit/media/crypto/proxy_decryptor.cc +++ b/webkit/media/crypto/proxy_decryptor.cc @@ -63,7 +63,7 @@ ProxyDecryptor::ProxyDecryptor( key_error_cb_(key_error_cb), key_message_cb_(key_message_cb), need_key_cb_(need_key_cb), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { } ProxyDecryptor::~ProxyDecryptor() { |