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

Unified Diff: media/cdm/ppapi/external_clear_key/clear_key_cdm.cc

Issue 1447943002: Revert of Add unit tests for CdmAdapter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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/cdm_adapter_unittest.cc ('k') | media/media.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
diff --git a/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc b/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
index 61f082035fc8edb8155a73f6190ce2261a6c66db..f6c77815303af428b5a131b4fa5e5915b4234691 100644
--- a/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
+++ b/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
@@ -212,15 +212,23 @@
}
}
+template<typename Type>
+class ScopedResetter {
+ public:
+ explicit ScopedResetter(Type* object) : object_(object) {}
+ ~ScopedResetter() { object_->Reset(); }
+
+ private:
+ Type* const object_;
+};
+
void INITIALIZE_CDM_MODULE() {
- DVLOG(1) << __FUNCTION__;
#if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER)
av_register_all();
#endif // CLEAR_KEY_CDM_USE_FFMPEG_DECODER
}
void DeinitializeCdmModule() {
- DVLOG(1) << __FUNCTION__;
}
void* CreateCdmInstance(int cdm_interface_version,
@@ -247,8 +255,7 @@
return NULL;
// TODO(jrummell): Obtain the proper origin for this instance.
- GURL empty_gurl;
- return new media::ClearKeyCdm(host, key_system_string, empty_gurl);
+ return new media::ClearKeyCdm(host, key_system_string, GURL::EmptyGURL());
}
const char* GetCdmVersion() {
« no previous file with comments | « media/cdm/cdm_adapter_unittest.cc ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698