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

Unified Diff: media/test/pipeline_integration_test.cc

Issue 835683002: media: Always define |cdm_id| in CdmContext. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments addressed Created 5 years, 9 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/aes_decryptor.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/test/pipeline_integration_test.cc
diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc
index 5e546a8416fcc777d6eb88daac08bf8c8f3df116..39e39140b7f022175614c3d4b21590ea1b50b012 100644
--- a/media/test/pipeline_integration_test.cc
+++ b/media/test/pipeline_integration_test.cc
@@ -219,10 +219,7 @@ class FakeEncryptedMedia {
TestCdmContext(Decryptor* decryptor) : decryptor_(decryptor) {}
Decryptor* GetDecryptor() final { return decryptor_; }
-
-#if defined(ENABLE_BROWSER_CDMS)
int GetCdmId() const final { return kInvalidCdmId; }
-#endif
private:
Decryptor* decryptor_;
« no previous file with comments | « media/cdm/aes_decryptor.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698