Componentizes external_video_surface to reduce webview/Cast duplication.

android_webview/native/external_video_surface_container_impl.h

Index: android_webview/native/external_video_surface_container_impl.h
diff --git a/android_webview/native/external_video_surface_container_impl.h b/android_webview/native/external_video_surface_container_impl.h
deleted file mode 100644
index 48ccd94d4f71e804bb48e6ef55d208e0090c611f..0000000000000000000000000000000000000000
--- a/android_webview/native/external_video_surface_container_impl.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// 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.
-
-#ifndef ANDROID_WEBVIEW_NATIVE_EXTERNAL_VIDEO_SURFACE_CONTAINER_IMPL_H_
-#define ANDROID_WEBVIEW_NATIVE_EXTERNAL_VIDEO_SURFACE_CONTAINER_IMPL_H_
-
-#include <jni.h>
-
-#include "base/android/scoped_java_ref.h"
-#include "base/callback.h"
-#include "base/compiler_specific.h"
-#include "content/public/browser/android/external_video_surface_container.h"
-
-namespace android_webview {
-
-class ExternalVideoSurfaceContainerImpl
-    : public content::ExternalVideoSurfaceContainer {
- public:
-  typedef base::Callback<void(int, jobject)> SurfaceCreatedCB;
-  typedef base::Callback<void(int)> SurfaceDestroyedCB;
-
-  static ExternalVideoSurfaceContainerImpl* Create(
-      content::WebContents* web_contents);
-
-  // ExternalVideoSurfaceContainer implementation.
-  void RequestExternalVideoSurface(
-      int player_id,
-      const SurfaceCreatedCB& surface_created_cb,
-      const SurfaceDestroyedCB& surface_destroyed_cb) override;
-  int GetCurrentPlayerId() override;
-  void ReleaseExternalVideoSurface(int player_id) override;
-  void OnFrameInfoUpdated() override;
-  void OnExternalVideoSurfacePositionChanged(int player_id,
-                                             const gfx::RectF& rect) override;
-
-  // Methods called from Java.
-  void SurfaceCreated(
-      JNIEnv* env, jobject obj, jint player_id, jobject jsurface);
-  void SurfaceDestroyed(JNIEnv* env, jobject obj, jint player_id);
-
- private:
-  explicit ExternalVideoSurfaceContainerImpl(
-      base::android::ScopedJavaLocalRef<jobject> java_content_view_core);
-  ~ExternalVideoSurfaceContainerImpl() override;
-
-  base::android::ScopedJavaGlobalRef<jobject> jobject_;
-
-  SurfaceCreatedCB surface_created_cb_;
-  SurfaceDestroyedCB surface_destroyed_cb_;
-
- DISALLOW_COPY_AND_ASSIGN(ExternalVideoSurfaceContainerImpl);
-};
-
-bool RegisterExternalVideoSurfaceContainer(JNIEnv* env);
-
-}  // namespace android_webview
-
-#endif  // ANDROID_WEBVIEW_NATIVE_EXTERNAL_VIDEO_SURFACE_CONTAINER_IMPL_H_