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

media/base/android/media_player_android.h

 // Copyright (c) 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 MEDIA_BASE_ANDROID_MEDIA_PLAYER_ANDROID_H_
 #define MEDIA_BASE_ANDROID_MEDIA_PLAYER_ANDROID_H_
 
 #include <jni.h>
 #include <string>
 
@@ skipping 57 matching lines @@
   virtual bool IsPlayerReady() = 0;
   virtual bool CanPause() = 0;
   virtual bool CanSeekForward() = 0;
   virtual bool CanSeekBackward() = 0;
   virtual GURL GetUrl();
   virtual GURL GetFirstPartyForCookies();
 
   // 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.
   // MediaPlayerListener callbacks.
   virtual void OnVideoSizeChanged(int width, int height);
   virtual void OnMediaError(int error_type);
   virtual void OnBufferingUpdate(int percent);
   virtual void OnPlaybackComplete();
   virtual void OnMediaInterrupted();
   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|.
   void AttachListener(jobject j_media_player);
   void DetachListener();
 
   MediaPlayerManager* manager() { return manager_; }
 
   RequestMediaResourcesCB request_media_resources_cb_;
 
  private:
+  friend class MediaPlayerListener;
+
   // Player ID assigned to this player.
   int player_id_;
 
   // Resource manager for all the media players.
   MediaPlayerManager* manager_;
 
   // Url for the frame that contains this player.
   GURL frame_url_;
 
   // Listener object that listens to all the media player events.
   scoped_ptr<MediaPlayerListener> listener_;
 
   // Weak pointer passed to |listener_| for callbacks.
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<MediaPlayerAndroid> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaPlayerAndroid);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_PLAYER_ANDROID_H_