Fix various MediaSource related crashes on Android.

webkit/media/android/webmediaplayer_android.h

Index: webkit/media/android/webmediaplayer_android.h
diff --git a/webkit/media/android/webmediaplayer_android.h b/webkit/media/android/webmediaplayer_android.h
index c492910e9422ef6bbb4d75d529864e270a2d1952..f3440866a9abb0fa8c16861b26af473e8e7156e1 100644
--- a/webkit/media/android/webmediaplayer_android.h
+++ b/webkit/media/android/webmediaplayer_android.h
@@ -19,6 +19,7 @@
 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h"
 #include "ui/gfx/rect_f.h"
+#include "webkit/media/android/media_source_delegate.h"
 #include "webkit/media/android/stream_texture_factory_android.h"
 
 namespace media {
@@ -34,8 +35,6 @@ class WebLayerImpl;
 }
 
 namespace webkit_media {
-
-class MediaSourceDelegate;
 class WebMediaPlayerManagerAndroid;
 class WebMediaPlayerProxyAndroid;
 
@@ -304,7 +303,8 @@ class WebMediaPlayerAndroid
   gfx::RectF last_computed_rect_;
 #endif
 
-  scoped_ptr<MediaSourceDelegate> media_source_delegate_;
+  scoped_ptr<MediaSourceDelegate,
+             MediaSourceDelegate::Destroyer> media_source_delegate_;
 
   // Proxy object that delegates method calls on Render Thread.
   // This object is created on the Render Thread and is only called in the