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

webkit/renderer/media/android/proxy_media_keys.cc

Index: webkit/renderer/media/android/proxy_media_keys.cc
diff --git a/webkit/renderer/media/android/proxy_media_keys.cc b/webkit/renderer/media/android/proxy_media_keys.cc
deleted file mode 100644
index 32741e48613c79490a2277532f0495c2dd24e9e4..0000000000000000000000000000000000000000
--- a/webkit/renderer/media/android/proxy_media_keys.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) 2013 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.
-
-#include "webkit/renderer/media/android/proxy_media_keys.h"
-
-#include "base/logging.h"
-#include "webkit/renderer/media/android/webmediaplayer_proxy_android.h"
-
-namespace webkit_media {
-
-ProxyMediaKeys::ProxyMediaKeys(WebMediaPlayerProxyAndroid* proxy,
-                               int media_keys_id)
-    : proxy_(proxy), media_keys_id_(media_keys_id) {
-  DCHECK(proxy_);
-}
-
-bool ProxyMediaKeys::GenerateKeyRequest(const std::string& type,
-                                        const uint8* init_data,
-                                        int init_data_length) {
-  proxy_->GenerateKeyRequest(
-      media_keys_id_,
-      type,
-      std::vector<uint8>(init_data, init_data + init_data_length));
-  return true;
-}
-
-void ProxyMediaKeys::AddKey(const uint8* key, int key_length,
-                            const uint8* init_data, int init_data_length,
-                            const std::string& session_id) {
-  proxy_->AddKey(media_keys_id_,
-                 std::vector<uint8>(key, key + key_length),
-                 std::vector<uint8>(init_data, init_data + init_data_length),
-                 session_id);
-}
-
-void ProxyMediaKeys::CancelKeyRequest(const std::string& session_id) {
-  proxy_->CancelKeyRequest(media_keys_id_, session_id);
-}
-
-}  // namespace webkit_media