Move webkit/renderer/media/android/ to content/renderer/media/android/.

content/renderer/media/webmediaplayer_proxy_impl_android.h

Index: content/renderer/media/webmediaplayer_proxy_impl_android.h
diff --git a/content/renderer/media/webmediaplayer_proxy_impl_android.h b/content/renderer/media/webmediaplayer_proxy_impl_android.h
deleted file mode 100644
index 3ee2ba5fad630b439ea8dd51f26a404226d2ff4b..0000000000000000000000000000000000000000
--- a/content/renderer/media/webmediaplayer_proxy_impl_android.h
+++ /dev/null
@@ -1,119 +0,0 @@
-// 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 CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_PROXY_IMPL_ANDROID_H_
-#define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_PROXY_IMPL_ANDROID_H_
-
-#include <map>
-
-#include "content/public/renderer/render_view_observer.h"
-#include "media/base/media_keys.h"
-#include "webkit/renderer/media/android/webmediaplayer_proxy_android.h"
-
-namespace webkit_media {
-class WebMediaPlayerAndroid;
-class WebMediaPlayerManagerAndroid;
-}
-
-namespace content {
-
-// This class manages all the IPC communications between
-// WebMediaPlayerAndroid and the MediaPlayerManagerAndroid in the browser
-// process.
-class WebMediaPlayerProxyImplAndroid
-    : public RenderViewObserver,
-      public webkit_media::WebMediaPlayerProxyAndroid {
- public:
-  // Construct a WebMediaPlayerProxyImplAndroid object for the |render_view|.
-  // |manager| is passed to this class so that it can find the right
-  // WebMediaPlayerAndroid using player IDs.
-  WebMediaPlayerProxyImplAndroid(
-      RenderView* render_view,
-      webkit_media::WebMediaPlayerManagerAndroid* manager);
-  virtual ~WebMediaPlayerProxyImplAndroid();
-
-  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
-
-  // Methods inherited from WebMediaPlayerProxyAndroid.
-  virtual void Initialize(
-      int player_id,
-      const GURL& url,
-      media::MediaPlayerAndroid::SourceType source_type,
-      const GURL& first_party_for_cookies) OVERRIDE;
-  virtual void Start(int player_id) OVERRIDE;
-  virtual void Pause(int player_id) OVERRIDE;
-  virtual void Seek(int player_id, base::TimeDelta time) OVERRIDE;
-  virtual void ReleaseResources(int player_id) OVERRIDE;
-  virtual void DestroyPlayer(int player_id) OVERRIDE;
-  virtual void EnterFullscreen(int player_id) OVERRIDE;
-  virtual void ExitFullscreen(int player_id) OVERRIDE;
-  virtual void DemuxerReady(
-      int player_id,
-      const media::MediaPlayerHostMsg_DemuxerReady_Params& params) OVERRIDE;
-  virtual void ReadFromDemuxerAck(
-      int player_id,
-      const media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params&) OVERRIDE;
-  virtual void DurationChanged(int player_id,
-                               const base::TimeDelta& duration) OVERRIDE;
-  virtual void InitializeCDM(int media_keys_id,
-                             const std::vector<uint8>& uuid) OVERRIDE;
-  virtual void GenerateKeyRequest(int media_keys_id,
-                                  const std::string& type,
-                                  const std::vector<uint8>& init_data) OVERRIDE;
-  virtual void AddKey(int media_keys_id,
-                      const std::vector<uint8>& key,
-                      const std::vector<uint8>& init_data,
-                      const std::string& session_id) OVERRIDE;
-  virtual void CancelKeyRequest(int media_keys_id,
-                                const std::string& session_id) OVERRIDE;
-
-#if defined(GOOGLE_TV)
-  virtual void RequestExternalSurface(
-      int player_id, const gfx::RectF& geometry) OVERRIDE;
-
-  // Methods inherited from RenderViewObserver.
-  virtual void DidCommitCompositorFrame() OVERRIDE;
-#endif
-
- private:
-  webkit_media::WebMediaPlayerAndroid* GetWebMediaPlayer(int player_id);
-
-  // Message handlers.
-  void OnMediaMetadataChanged(int player_id, base::TimeDelta duration,
-                              int width, int height, bool success);
-  void OnMediaPlaybackCompleted(int player_id);
-  void OnMediaBufferingUpdate(int player_id, int percent);
-  void OnMediaSeekCompleted(int player_id, base::TimeDelta current_time);
-  void OnMediaError(int player_id, int error);
-  void OnVideoSizeChanged(int player_id, int width, int height);
-  void OnTimeUpdate(int player_id, base::TimeDelta current_time);
-  void OnMediaPlayerReleased(int player_id);
-  void OnDidExitFullscreen(int player_id);
-  void OnDidEnterFullscreen(int player_id);
-  void OnPlayerPlay(int player_id);
-  void OnPlayerPause(int player_id);
-  void OnReadFromDemuxer(
-      int player_id, media::DemuxerStream::Type type, bool seek_done);
-  void OnMediaSeekRequest(int player_id, base::TimeDelta time_to_seek,
-                          unsigned seek_request_id);
-  void OnMediaConfigRequest(int player_id);
-  void OnKeyAdded(int media_keys_id,
-                  const std::string& session_id);
-  void OnKeyError(int media_keys_id,
-                  const std::string& session_id,
-                  media::MediaKeys::KeyError error_code,
-                  int system_code);
-  void OnKeyMessage(int media_keys_id,
-                    const std::string& session_id,
-                    const std::string& message,
-                    const std::string& destination_url);
-
-  webkit_media::WebMediaPlayerManagerAndroid* manager_;
-
-  DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerProxyImplAndroid);
-};
-
-}  // namespace content
-
-#endif  // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_PROXY_IMPL_ANDROID_H_