Move ExternalVideoSurfaceHolder from WebContents UserData to BrowserMediaPlayerManager.

android_webview/native/external_video_surface_container_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/native/external_video_surface_container_impl.h"
 
 #include "base/android/jni_android.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "jni/ExternalVideoSurfaceContainer_jni.h"
 #include "ui/gfx/rect_f.h"
 
-using android_webview::ExternalVideoSurfaceContainerImpl;
 using base::android::AttachCurrentThread;
 using content::ContentViewCore;
 
-DEFINE_WEB_CONTENTS_USER_DATA_KEY(ExternalVideoSurfaceContainerImpl);
-
-namespace content {
-
-// static
-void ExternalVideoSurfaceContainer::CreateForWebContents(
-    WebContents* web_contents) {
-  WebContentsUserData<ExternalVideoSurfaceContainerImpl>::CreateForWebContents(
-      web_contents);
-}
-
-// static
-ExternalVideoSurfaceContainer* ExternalVideoSurfaceContainer::FromWebContents(
-    WebContents* web_contents) {
-  return WebContentsUserData<ExternalVideoSurfaceContainerImpl>::
-      FromWebContents(web_contents);
-}
-
-} // namespace content
-
 namespace android_webview {
 
 ExternalVideoSurfaceContainerImpl::ExternalVideoSurfaceContainerImpl(
     content::WebContents* web_contents) {
   ContentViewCore* cvc = ContentViewCore::FromWebContents(web_contents);
   if (cvc) {
     JNIEnv* env = AttachCurrentThread();
     jobject_.Reset(
         Java_ExternalVideoSurfaceContainer_create(
             env, reinterpret_cast<intptr_t>(this), cvc->GetJavaObject().obj()));
@@ skipping 57 matching lines @@
     JNIEnv* env, jobject obj, jint player_id) {
   if (!surface_destroyed_cb_.is_null())
     surface_destroyed_cb_.Run(static_cast<int>(player_id));
 }
 
 bool RegisterExternalVideoSurfaceContainer(JNIEnv* env) {
   return RegisterNativesImpl(env) >= 0;
 }
 
 }  // namespace android_webview