Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / android_webview / native / external_video_surface_container_impl.cc

diff --git a/src/android_webview/native/external_video_surface_container_impl.cc b/src/android_webview/native/external_video_surface_container_impl.cc
index 351b3ca..1a10ab5 100644 (file)
--- a/src/android_webview/native/external_video_surface_container_impl.cc
+++ b/src/android_webview/native/external_video_surface_container_impl.cc
@@ -9,30 +9,9 @@
 #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(
@@ -106,7 +85,7 @@ void ExternalVideoSurfaceContainerImpl::SurfaceDestroyed(
 }
 
 bool RegisterExternalVideoSurfaceContainer(JNIEnv* env) {
-  return RegisterNativesImpl(env) >= 0;
+  return RegisterNativesImpl(env);
 }
 
 }  // namespace android_webview