Move ExternalVideoSurfaceHolder from WebContents UserData to BrowserMediaPlayerManager.

android_webview/browser/aw_content_browser_client.cc

Index: android_webview/browser/aw_content_browser_client.cc
diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc
index b1edcfdea5dea49320a7da258fe3d152d0f4917b..778e46648aa5fa91d68ad101cd50394920c927cf 100644
--- a/android_webview/browser/aw_content_browser_client.cc
+++ b/android_webview/browser/aw_content_browser_client.cc
@@ -501,4 +501,12 @@ void AwContentBrowserClient::OverrideWebkitPrefs(content::RenderViewHost* rvh,
       content::WebContents::FromRenderViewHost(rvh), web_prefs);
 }
 
+#if defined(VIDEO_HOLE)
+content::ExternalVideoSurfaceContainer*
+AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer(
+    content::WebContents* web_contents) {
+  return native_factory_->CreateExternalVideoSurfaceContainer(web_contents);
+}
+#endif
+
 }  // namespace android_webview