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

Side by Side Diff: Tools/DumpRenderTree/chromium/TestRunner/src/WebTestInterfaces.cpp

Issue 16778002: MediaStream API: Changing the device enumeration to be async (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Moved files Created 7 years, 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 return m_interfaces->themeEngine(); 89 return m_interfaces->themeEngine();
90 } 90 }
91 91
92 TestInterfaces* WebTestInterfaces::testInterfaces() 92 TestInterfaces* WebTestInterfaces::testInterfaces()
93 { 93 {
94 return m_interfaces.get(); 94 return m_interfaces.get();
95 } 95 }
96 96
97 WebMediaStreamCenter* WebTestInterfaces::createMediaStreamCenter(WebMediaStreamC enterClient* client) 97 WebMediaStreamCenter* WebTestInterfaces::createMediaStreamCenter(WebMediaStreamC enterClient* client)
98 { 98 {
99 return new MockWebMediaStreamCenter(client); 99 return new MockWebMediaStreamCenter(client, m_interfaces.get());
100 } 100 }
101 101
102 WebRTCPeerConnectionHandler* WebTestInterfaces::createWebRTCPeerConnectionHandle r(WebRTCPeerConnectionHandlerClient* client) 102 WebRTCPeerConnectionHandler* WebTestInterfaces::createWebRTCPeerConnectionHandle r(WebRTCPeerConnectionHandlerClient* client)
103 { 103 {
104 return new MockWebRTCPeerConnectionHandler(client, m_interfaces.get()); 104 return new MockWebRTCPeerConnectionHandler(client, m_interfaces.get());
105 } 105 }
106 106
107 } 107 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698