Move ExternalVideoSurfaceHolder from WebContents UserData to BrowserMediaPlayerManager.

content/public/browser/android/external_video_surface_container.h

Index: content/public/browser/android/external_video_surface_container.h
diff --git a/content/public/browser/android/external_video_surface_container.h b/content/public/browser/android/external_video_surface_container.h
index 1b630e1dbe620326b3ea539d574e012ff1885b86..38cbe5987bac76912dcae34ef3502e4e4ffe0f9a 100644
--- a/content/public/browser/android/external_video_surface_container.h
+++ b/content/public/browser/android/external_video_surface_container.h
@@ -23,14 +23,6 @@ class CONTENT_EXPORT ExternalVideoSurfaceContainer {
   typedef base::Callback<void(int, jobject)> SurfaceCreatedCB;
   typedef base::Callback<void(int)> SurfaceDestroyedCB;
 
-  // Creates an ExternalVideoSurfaceContainer, and attaches it to the given
-  // WebContents. If an instance is already attached, does nothing.
-  static void CreateForWebContents(WebContents* contents);
-
-  // Returns the existing ExternalVideoSurfaceContainer attached to the given
-  // WebContents or NULL.
-  static ExternalVideoSurfaceContainer* FromWebContents(WebContents* contents);
-
   // Called when a media player wants to request an external video surface.
   // Whenever the surface is created and visible, |surface_created_cb| will be
   // called.  And whenever it is destroyed or invisible, |surface_destroyed_cb|
@@ -52,7 +44,6 @@ class CONTENT_EXPORT ExternalVideoSurfaceContainer {
   // Called when the page that contains the video element is scrolled or zoomed.
   virtual void OnFrameInfoUpdated() = 0;
 
- protected:
   virtual ~ExternalVideoSurfaceContainer() {}
 };