Move deferred loading logic from WebMediaPlayerClientImpl to HTMLMediaElement.

Source/web/WebMediaPlayerClientImpl.h

Index: Source/web/WebMediaPlayerClientImpl.h
diff --git a/Source/web/WebMediaPlayerClientImpl.h b/Source/web/WebMediaPlayerClientImpl.h
index 31369276fc2807969a6b93f187ae7d500991dd01..d7164622695ef4ea6348337727e241f919ec01a6 100644
--- a/Source/web/WebMediaPlayerClientImpl.h
+++ b/Source/web/WebMediaPlayerClientImpl.h
@@ -95,10 +95,9 @@ public:
 
     // MediaPlayer methods:
     virtual WebMediaPlayer* webMediaPlayer() const OVERRIDE;
-    virtual void load(WebMediaPlayer::LoadType, const WTF::String& url) OVERRIDE;
+    virtual void load(WebMediaPlayer::LoadType, const WTF::String& url, WebMediaPlayer::CORSMode) OVERRIDE;
     virtual void play() OVERRIDE;
     virtual void pause() OVERRIDE;
-    virtual void prepareToPlay() OVERRIDE;
     virtual bool supportsSave() const OVERRIDE;
     virtual WebCore::IntSize naturalSize() const OVERRIDE;
     virtual bool hasVideo() const OVERRIDE;
@@ -138,27 +137,23 @@ public:
 private:
     explicit WebMediaPlayerClientImpl(WebCore::MediaPlayerClient*);
 
-    void startDelayedLoad();
-    void loadInternal();
-
     WebCore::HTMLMediaElement& mediaElement() const;
 
+    WebCore::MediaPlayerClient* m_client;
+    OwnPtr<WebMediaPlayer> m_webMediaPlayer;
+    WebCore::MediaPlayer::Preload m_preload;
+    bool m_needsWebLayerForVideo;
+    double m_rate;
+
 #if OS(ANDROID)
     // FIXME: This path "only works" on Android. It is a workaround for the problem that Skia could not handle Android's GL_TEXTURE_EXTERNAL_OES
     // texture internally. It should be removed and replaced by the normal paint path.
     // https://code.google.com/p/skia/issues/detail?id=1189
     void paintOnAndroid(WebCore::GraphicsContext*, const WebCore::IntRect&, uint8_t alpha);
     SkBitmap m_bitmap;
+    bool m_usePaintOnAndroid;
 #endif
 
-    WebCore::MediaPlayerClient* m_client;
-    OwnPtr<WebMediaPlayer> m_webMediaPlayer;
-    WebCore::KURL m_url;
-    bool m_delayingLoad;
-    WebCore::MediaPlayer::Preload m_preload;
-    bool m_needsWebLayerForVideo;
-    double m_rate;
-
 #if ENABLE(WEB_AUDIO)
     // AudioClientImpl wraps an AudioSourceProviderClient.
     // When the audio format is known, Chromium calls setFormat() which then dispatches into WebCore.
@@ -206,8 +201,6 @@ private:
 
     AudioSourceProviderImpl m_audioSourceProvider;
 #endif
-
-    WebMediaPlayer::LoadType m_loadType;
 };
 
 } // namespace blink