WeakPtr destruction order cleanup: media edition.

content/renderer/media/cdm_session_adapter.h

Index: content/renderer/media/cdm_session_adapter.h
diff --git a/content/renderer/media/cdm_session_adapter.h b/content/renderer/media/cdm_session_adapter.h
index 611f25b5038cb12c99d83a1ddf4399e81fb9b429..38ad075d8e89e8f1ddf8229a111eb38027dc5635 100644
--- a/content/renderer/media/cdm_session_adapter.h
+++ b/content/renderer/media/cdm_session_adapter.h
@@ -87,13 +87,15 @@ class CdmSessionAdapter : public base::RefCounted<CdmSessionAdapter> {
 
   scoped_ptr<media::MediaKeys> media_keys_;
 
-  base::WeakPtrFactory<CdmSessionAdapter> weak_ptr_factory_;
-
   SessionMap sessions_;
 
   // Session ID should be unique per renderer process for debugging purposes.
   static uint32 next_session_id_;
 
+  // NOTE: This must always be last so it's invalidated before other member
+  // variables might be accessed.
+  base::WeakPtrFactory<CdmSessionAdapter> weak_ptr_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(CdmSessionAdapter);
 };