Move ExternalVideoSurfaceHolder from WebContents UserData to BrowserMediaPlayerManager.

android_webview/lib/main/aw_main_delegate.h

 // Copyright (c) 2012 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.
 
 #ifndef ANDROID_WEBVIEW_LIB_MAIN_AW_MAIN_DELEGATE_H_
 #define ANDROID_WEBVIEW_LIB_MAIN_AW_MAIN_DELEGATE_H_
 
 #include "android_webview/browser/jni_dependency_factory.h"
 #include "android_webview/common/aw_content_client.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/app/content_main_delegate.h"
 
 namespace content {
 class BrowserMainRunner;
+class ExternalVideoSurfaceContainel;
 }
 
 namespace android_webview {
 
 class AwContentBrowserClient;
 class AwContentRendererClient;
 class GpuMemoryBufferFactoryImpl;
 
 // Android WebView implementation of ContentMainDelegate.
 class AwMainDelegate : public content::ContentMainDelegate,
@@ skipping 16 matching lines @@
       CreateContentRendererClient() OVERRIDE;
 
   // JniDependencyFactory implementation.
   virtual scoped_refptr<AwQuotaManagerBridge> CreateAwQuotaManagerBridge(
       AwBrowserContext* browser_context) OVERRIDE;
   virtual content::GeolocationPermissionContext* CreateGeolocationPermission(
       AwBrowserContext* browser_context) OVERRIDE;
   virtual content::WebContentsViewDelegate* CreateViewDelegate(
       content::WebContents* web_contents) OVERRIDE;
   virtual AwWebPreferencesPopulater* CreateWebPreferencesPopulater() OVERRIDE;
+#if defined(VIDEO_HOLE)
+  virtual content::ExternalVideoSurfaceContainer*
+      CreateExternalVideoSurfaceContainer(
+          content::WebContents* web_contents) OVERRIDE;
+#endif
 
   scoped_ptr<content::BrowserMainRunner> browser_runner_;
   AwContentClient content_client_;
   scoped_ptr<AwContentBrowserClient> content_browser_client_;
   scoped_ptr<AwContentRendererClient> content_renderer_client_;
   scoped_ptr<GpuMemoryBufferFactoryImpl> gpu_memory_buffer_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AwMainDelegate);
 };
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_LIB_MAIN_AW_MAIN_DELEGATE_H_