Upstream WebMediaPlayerAndroid as WebKit::WebMediaPlayer implementation on android.

webkit/media/webkit_media.gypi

Index: webkit/media/webkit_media.gypi
diff --git a/webkit/media/webkit_media.gypi b/webkit/media/webkit_media.gypi
index fb62d197c422a87e32656788a73f7bded30a6ac4..cdac9c7e2afb09e1b601c1edc9514d837019f241 100644
--- a/webkit/media/webkit_media.gypi
+++ b/webkit/media/webkit_media.gypi
@@ -15,6 +15,10 @@
       ],
       'sources': [
         'android/audio_decoder_android.cc',
+        'android/webmediaplayer_android.cc',
+        'android/webmediaplayer_android.h',
+        'android/webmediaplayer_proxy_android.cc',
+        'android/webmediaplayer_proxy_android.h',
         'active_loader.cc',
         'active_loader.h',
         'audio_decoder.cc',
@@ -34,6 +38,8 @@
         'webmediaplayer_impl.h',
         'webmediaplayer_proxy.cc',
         'webmediaplayer_proxy.h',
+        'webmediaplayer_util.cc',
+        'webmediaplayer_util.h',
         'webvideoframe_impl.cc',
         'webvideoframe_impl.h',
       ],
@@ -43,12 +49,19 @@
             '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',
           ],
         }],
-        ['OS=="android"', {
+        ['OS == "android"', {
           'sources!': [
             'audio_decoder.cc',
             'webmediaplayer_impl.cc',
             'webmediaplayer_impl.h',
           ],
+          'dependencies': [
+            '<(DEPTH)/media/media.gyp:player_android',
+          ],
+        }, { # OS != "android"'
+          'sources/': [
+            ['exclude', '^android/'],
+          ],
         }],
       ],
     },