Revert of Fix a crash that MediaPlayerAndroid weak_ptr is incorrectly used across thread

media/base/android/media_player_android.h

Index: media/base/android/media_player_android.h
diff --git a/media/base/android/media_player_android.h b/media/base/android/media_player_android.h
index 6c534e80ad589d99f61d01d0c3b7e869e90a0401..cd5a92f18e1239fca5f9fa2df61e1e4771a303c2 100644
--- a/media/base/android/media_player_android.h
+++ b/media/base/android/media_player_android.h
@@ -75,6 +75,16 @@
   // Associates the |cdm| with this player.
   virtual void SetCdm(BrowserCdm* cdm);
 
+  int player_id() { return player_id_; }
+
+  GURL frame_url() { return frame_url_; }
+
+ protected:
+  MediaPlayerAndroid(int player_id,
+                     MediaPlayerManager* manager,
+                     const RequestMediaResourcesCB& request_media_resources_cb,
+                     const GURL& frame_url);
+
   // TODO(qinmin): Simplify the MediaPlayerListener class to only listen to
   // media interrupt events. And have a separate child class to listen to all
   // the events needed by MediaPlayerBridge. http://crbug.com/422597.
@@ -87,16 +97,6 @@
   virtual void OnSeekComplete();
   virtual void OnMediaPrepared();
 
-  int player_id() { return player_id_; }
-
-  GURL frame_url() { return frame_url_; }
-
- protected:
-  MediaPlayerAndroid(int player_id,
-                     MediaPlayerManager* manager,
-                     const RequestMediaResourcesCB& request_media_resources_cb,
-                     const GURL& frame_url);
-
   // Attach/Detaches |listener_| for listening to all the media events. If
   // |j_media_player| is NULL, |listener_| only listens to the system media
   // events. Otherwise, it also listens to the events from |j_media_player|.
@@ -108,6 +108,8 @@
   RequestMediaResourcesCB request_media_resources_cb_;
 
  private:
+  friend class MediaPlayerListener;
+
   // Player ID assigned to this player.
   int player_id_;