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

Unified Diff: Tools/DumpRenderTree/chromium/TestRunner/src/MockWebMediaStreamCenter.h

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 side-by-side diff with in-line comments
Download patch
Index: Tools/DumpRenderTree/chromium/TestRunner/src/MockWebMediaStreamCenter.h
diff --git a/Tools/DumpRenderTree/chromium/TestRunner/src/MockWebMediaStreamCenter.h b/Tools/DumpRenderTree/chromium/TestRunner/src/MockWebMediaStreamCenter.h
index e8d077260034d84a1ba88c311c362ab7e13ea27c..7cae9ce63e28e01fcc05c945c829ef2842929278 100644
--- a/Tools/DumpRenderTree/chromium/TestRunner/src/MockWebMediaStreamCenter.h
+++ b/Tools/DumpRenderTree/chromium/TestRunner/src/MockWebMediaStreamCenter.h
@@ -32,6 +32,7 @@
#define MockWebMediaStreamCenter_h
#include "TestCommon.h"
+#include "WebTask.h"
#include "public/platform/WebMediaStreamCenter.h"
namespace WebKit {
@@ -40,12 +41,14 @@ class WebMediaStreamCenterClient;
namespace WebTestRunner {
+class TestInterfaces;
+
class MockWebMediaStreamCenter : public WebKit::WebMediaStreamCenter {
public:
- explicit MockWebMediaStreamCenter(WebKit::WebMediaStreamCenterClient*);
+ MockWebMediaStreamCenter(WebKit::WebMediaStreamCenterClient*, TestInterfaces*);
virtual void queryMediaStreamSources(const WebKit::WebMediaStreamSourcesRequest&) OVERRIDE;
- virtual bool getSourceInfos(const WebKit::WebString& url, WebKit::WebVector<WebKit::WebSourceInfo>&) OVERRIDE;
+ virtual bool getMediaStreamTrackSources(const WebKit::WebMediaStreamTrackSourcesRequest&) OVERRIDE;
virtual void didEnableMediaStreamTrack(const WebKit::WebMediaStream&, const WebKit::WebMediaStreamTrack&) OVERRIDE;
virtual void didDisableMediaStreamTrack(const WebKit::WebMediaStream&, const WebKit::WebMediaStreamTrack&) OVERRIDE;
virtual bool didAddMediaStreamTrack(const WebKit::WebMediaStream&, const WebKit::WebMediaStreamTrack&) OVERRIDE;
@@ -53,8 +56,14 @@ public:
virtual void didStopLocalMediaStream(const WebKit::WebMediaStream&) OVERRIDE;
virtual void didCreateMediaStream(WebKit::WebMediaStream&) OVERRIDE;
+ // Task related methods
+ WebTaskList* taskList() { return &m_taskList; }
+
private:
MockWebMediaStreamCenter() { }
+
+ WebTaskList m_taskList;
+ TestInterfaces* m_interfaces;
};
}

Powered by Google App Engine
This is Rietveld 408576698