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

Side by Side Diff: Source/core/testing/MockCDM.h

Issue 15178010: Remove ENABLE_ENCRYPTED_MEDIA #define as it's always enabled (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/platform/graphics/MediaPlayerPrivate.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2013 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 virtual bool supportsMIMEType(const String& mimeType) OVERRIDE; 46 virtual bool supportsMIMEType(const String& mimeType) OVERRIDE;
47 virtual PassOwnPtr<CDMSession> createSession() OVERRIDE; 47 virtual PassOwnPtr<CDMSession> createSession() OVERRIDE;
48 48
49 protected: 49 protected:
50 MockCDM(CDM* cdm) : m_cdm(cdm) { } 50 MockCDM(CDM* cdm) : m_cdm(cdm) { }
51 CDM* m_cdm; 51 CDM* m_cdm;
52 }; 52 };
53 53
54 } 54 }
55 55
56 #endif // ENABLE(ENCRYPTED_MEDIA) 56 #endif // ENABLE(ENCRYPTED_MEDIA_V2)
57 57
58 #endif // MockCDM_h 58 #endif // MockCDM_h
OLDNEW
« no previous file with comments | « Source/core/platform/graphics/MediaPlayerPrivate.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698