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

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

Issue 14022018: Absolutify paths to html/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase 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/testing/Internals.cpp ('k') | Source/core/testing/MockPagePopupDriver.cpp » ('j') | 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 11 matching lines...) Expand all
22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23 * THE POSSIBILITY OF SUCH DAMAGE. 23 * THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "MockCDM.h" 27 #include "MockCDM.h"
28 28
29 #if ENABLE(ENCRYPTED_MEDIA_V2) 29 #if ENABLE(ENCRYPTED_MEDIA_V2)
30 30
31 #include "CDM.h" 31 #include "CDM.h"
32 #include "MediaKeyError.h" 32 #include "core/html/MediaKeyError.h"
33 #include <wtf/Uint8Array.h> 33 #include <wtf/Uint8Array.h>
34 34
35 namespace WebCore { 35 namespace WebCore {
36 36
37 class MockCDMSession : public CDMSession { 37 class MockCDMSession : public CDMSession {
38 public: 38 public:
39 static PassOwnPtr<MockCDMSession> create() { return adoptPtr(new MockCDMSess ion()); } 39 static PassOwnPtr<MockCDMSession> create() { return adoptPtr(new MockCDMSess ion()); }
40 virtual ~MockCDMSession() { } 40 virtual ~MockCDMSession() { }
41 41
42 virtual const String& sessionId() const OVERRIDE { return m_sessionId; } 42 virtual const String& sessionId() const OVERRIDE { return m_sessionId; }
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 errorCode = MediaKeyError::MEDIA_KEYERR_CLIENT; 135 errorCode = MediaKeyError::MEDIA_KEYERR_CLIENT;
136 return false; 136 return false;
137 } 137 }
138 } 138 }
139 return true; 139 return true;
140 } 140 }
141 141
142 } 142 }
143 143
144 #endif // ENABLE(ENCRYPTED_MEDIA_V2) 144 #endif // ENABLE(ENCRYPTED_MEDIA_V2)
OLDNEW
« no previous file with comments | « Source/core/testing/Internals.cpp ('k') | Source/core/testing/MockPagePopupDriver.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698