Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(373)

Unified Diff: media/cdm/ppapi/fake_cdm_video_decoder.cc

Issue 22362007: Relocate last remnants of webkit/renderer/media code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make chromeos crypto dep explicit. Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/cdm/ppapi/fake_cdm_video_decoder.h ('k') | media/cdm/ppapi/ffmpeg_cdm_audio_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/ppapi/fake_cdm_video_decoder.cc
diff --git a/webkit/renderer/media/crypto/ppapi/fake_cdm_video_decoder.cc b/media/cdm/ppapi/fake_cdm_video_decoder.cc
similarity index 93%
rename from webkit/renderer/media/crypto/ppapi/fake_cdm_video_decoder.cc
rename to media/cdm/ppapi/fake_cdm_video_decoder.cc
index 18706214ca960f25be46c27a2bb4750378aa24cb..b23e5a721cb4a2d7306b080fee2c4fe6a391d59c 100644
--- a/webkit/renderer/media/crypto/ppapi/fake_cdm_video_decoder.cc
+++ b/media/cdm/ppapi/fake_cdm_video_decoder.cc
@@ -2,12 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "webkit/renderer/media/crypto/ppapi/fake_cdm_video_decoder.h"
+#include "media/cdm/ppapi/fake_cdm_video_decoder.h"
#include "base/logging.h"
-#include "webkit/renderer/media/crypto/ppapi/cdm/content_decryption_module.h"
-namespace webkit_media {
+namespace media {
FakeCdmVideoDecoder::FakeCdmVideoDecoder(cdm::Host* host)
: is_initialized_(false),
@@ -89,4 +88,4 @@ cdm::Status FakeCdmVideoDecoder::DecodeFrame(const uint8_t* compressed_frame,
return cdm::kSuccess;
}
-} // namespace webkit_media
+} // namespace media
« no previous file with comments | « media/cdm/ppapi/fake_cdm_video_decoder.h ('k') | media/cdm/ppapi/ffmpeg_cdm_audio_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698