Refactor MediaSourceDelegate destruction.

content/renderer/media/android/webmediaplayer_android.h

Index: content/renderer/media/android/webmediaplayer_android.h
diff --git a/content/renderer/media/android/webmediaplayer_android.h b/content/renderer/media/android/webmediaplayer_android.h
index d6b7575a7b9e9414920aa5709c25643da87bcfc3..c477dfd79f095908410d4dc068dac4e6dc9488f3 100644
--- a/content/renderer/media/android/webmediaplayer_android.h
+++ b/content/renderer/media/android/webmediaplayer_android.h
@@ -459,9 +459,6 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer,
   bool force_use_overlay_embedded_video_;
 #endif  // defined(VIDEO_HOLE)
 
-  scoped_ptr<MediaSourceDelegate,
-             MediaSourceDelegate::Destroyer> media_source_delegate_;
-
   // Internal pending playback state.
   // Store a playback request that cannot be started immediately.
   bool pending_playback_;
@@ -511,6 +508,8 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer,
   // as playback progresses.
   media::TimeDeltaInterpolator interpolator_;
 
+  scoped_ptr<MediaSourceDelegate> media_source_delegate_;
+
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_;