Reorganizes Chromecast code to better reflect functional dependencies.

chromecast/shell/browser/android/external_video_surface_container_impl.h

Index: chromecast/shell/browser/android/external_video_surface_container_impl.h
diff --git a/chromecast/shell/browser/android/external_video_surface_container_impl.h b/chromecast/shell/browser/android/external_video_surface_container_impl.h
deleted file mode 100644
index 91908a5c7bece4cc0d92c8ca7aeab4b792a108ee..0000000000000000000000000000000000000000
--- a/chromecast/shell/browser/android/external_video_surface_container_impl.h
+++ /dev/null
@@ -1,57 +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 CHROMECAST_SHELL_BROWSER_ANDROID_EXTERNAL_VIDEO_SURFACE_CONTAINER_IMPL_H_
-#define CHROMECAST_SHELL_BROWSER_ANDROID_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 chromecast {
-namespace shell {
-
-class ExternalVideoSurfaceContainerImpl
-    : public content::ExternalVideoSurfaceContainer {
- public:
-  typedef base::Callback<void(int, jobject)> SurfaceCreatedCB;
-  typedef base::Callback<void(int)> SurfaceDestroyedCB;
-
-  ExternalVideoSurfaceContainerImpl(content::WebContents* contents);
-
-  // ExternalVideoSurfaceContainer implementation.
-  virtual void RequestExternalVideoSurface(
-      int player_id,
-      const SurfaceCreatedCB& surface_created_cb,
-      const SurfaceDestroyedCB& surface_destroyed_cb) OVERRIDE;
-  virtual void ReleaseExternalVideoSurface(int player_id) OVERRIDE;
-  virtual void OnFrameInfoUpdated() OVERRIDE;
-  virtual 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:
-  virtual ~ExternalVideoSurfaceContainerImpl();
-
-  base::android::ScopedJavaGlobalRef<jobject> jobject_;
-
-  SurfaceCreatedCB surface_created_cb_;
-  SurfaceDestroyedCB surface_destroyed_cb_;
-
- DISALLOW_COPY_AND_ASSIGN(ExternalVideoSurfaceContainerImpl);
-};
-
-bool RegisterExternalVideoSurfaceContainer(JNIEnv* env);
-
-}  // namespace shell
-}  // namespace chromecast
-
-#endif  // CHROMECAST_SHELL_BROWSER_ANDROID_EXTERNAL_VIDEO_SURFACE_CONTAINER_IMPL_H_