Revert of Added stub MediaSourcePlayer for developing behind the flag

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 21 matching lines @@
   enum MediaErrorType {
     MEDIA_ERROR_FORMAT,
     MEDIA_ERROR_DECODE,
     MEDIA_ERROR_NOT_VALID_FOR_PROGRESSIVE_PLAYBACK,
     MEDIA_ERROR_INVALID_CODE,
   };
 
   // Callback when the player needs decoding resources.
   typedef base::Callback<void(int player_id)> RequestMediaResourcesCB;
 
-  // Virtual destructor.
-  // For most subclasses we can delete on the caller thread.
-  virtual void DeleteOnCorrectThread() { delete this; }
-
   // Passing an external java surface object to the player.
   virtual void SetVideoSurface(gfx::ScopedJavaSurface surface) = 0;
 
   // Start playing the media.
   virtual void Start() = 0;
 
   // Pause the media.
   virtual void Pause(bool is_media_related_action) = 0;
 
   // Seek to a particular position, based on renderer signaling actual seek
@@ skipping 43 matching lines @@
   virtual void OnPlaybackComplete();
   virtual void OnMediaInterrupted();
   virtual void OnSeekComplete();
   virtual void OnMediaPrepared();
 
   // 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();
-
-  // When destroying a subclassed object on a non-UI thread
-  // it is still required to destroy the |listener_| related stuff
-  // on the UI thread.
-  void DestroyListenerOnUIThread();
   void SetAudible(bool is_audible);
 
   MediaPlayerManager* manager() { return manager_; }
 
   RequestMediaResourcesCB request_media_resources_cb_;
 
  private:
   friend class MediaPlayerListener;
 
   // Player ID assigned to this player.
@@ skipping 14 matching lines @@
   // 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_