WeakPtr destruction order cleanup: media edition.

content/renderer/media/crypto/proxy_decryptor.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_
 #define CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 91 matching lines @@
                       uint32 system_code);
 
   // Helper function to determine session_id for the provided |web_session_id|.
   uint32 LookupSessionId(const std::string& web_session_id) const;
 
   // Helper function to determine web_session_id for the provided |session_id|.
   // The returned web_session_id is only valid on the main thread, and should be
   // 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_;
 #elif defined(OS_ANDROID)
   RendererMediaPlayerManager* manager_;
   int cdm_id_;
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
   // The real MediaKeys that manages key operations for the ProxyDecryptor.
   scoped_ptr<media::MediaKeys> media_keys_;
 
   // Callbacks for firing key events.
   KeyAddedCB key_added_cb_;
   KeyErrorCB key_error_cb_;
   KeyMessageCB key_message_cb_;
 
   // Session IDs are used to uniquely track sessions so that CDM callbacks
   // can get mapped to the correct session ID. Session ID should be unique
   // per renderer process for debugging purposes.
   static uint32 next_session_id_;
 
   SessionIdMap sessions_;
 
   std::set<uint32> persistent_sessions_;
 
   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);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_