| Index: content/renderer/media/crypto/proxy_decryptor.h
|
| diff --git a/content/renderer/media/crypto/proxy_decryptor.h b/content/renderer/media/crypto/proxy_decryptor.h
|
| index 981566624055522a95e170103976719dbde9d730..27d5e574f3f6dc5b825028c17f165724059fe9f4 100644
|
| --- a/content/renderer/media/crypto/proxy_decryptor.h
|
| +++ b/content/renderer/media/crypto/proxy_decryptor.h
|
| @@ -109,8 +109,6 @@ class ProxyDecryptor {
|
| // stored by copy.
|
| const std::string& LookupWebSessionId(uint32 session_id) const;
|
|
|
| - base::WeakPtrFactory<ProxyDecryptor> weak_ptr_factory_;
|
| -
|
| #if defined(ENABLE_PEPPER_CDMS)
|
| // Callback to create the Pepper plugin.
|
| CreatePepperCdmCB create_pepper_cdm_cb_;
|
| @@ -138,6 +136,10 @@ class ProxyDecryptor {
|
|
|
| bool is_clear_key_;
|
|
|
| + // NOTE: This must always be last so it's invalidated before other member
|
| + // variables might be accessed.
|
| + base::WeakPtrFactory<ProxyDecryptor> weak_ptr_factory_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(ProxyDecryptor);
|
| };
|
|
|
|
|