summaryrefslogtreecommitdiff
path: root/chromium/content/renderer/media/stream/user_media_client_impl.h
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/content/renderer/media/stream/user_media_client_impl.h')
-rw-r--r--chromium/content/renderer/media/stream/user_media_client_impl.h18
1 files changed, 10 insertions, 8 deletions
diff --git a/chromium/content/renderer/media/stream/user_media_client_impl.h b/chromium/content/renderer/media/stream/user_media_client_impl.h
index aa6ae570dcc..e7b8c3b30fc 100644
--- a/chromium/content/renderer/media/stream/user_media_client_impl.h
+++ b/chromium/content/renderer/media/stream/user_media_client_impl.h
@@ -16,10 +16,10 @@
#include "content/common/media/media_devices.h"
#include "content/public/renderer/render_frame_observer.h"
#include "content/renderer/media/stream/user_media_processor.h"
-#include "third_party/WebKit/public/platform/modules/mediastream/media_devices.mojom.h"
-#include "third_party/WebKit/public/web/WebApplyConstraintsRequest.h"
-#include "third_party/WebKit/public/web/WebUserMediaClient.h"
-#include "third_party/WebKit/public/web/WebUserMediaRequest.h"
+#include "third_party/blink/public/platform/modules/mediastream/media_devices.mojom.h"
+#include "third_party/blink/public/web/web_apply_constraints_request.h"
+#include "third_party/blink/public/web/web_user_media_client.h"
+#include "third_party/blink/public/web/web_user_media_request.h"
namespace content {
@@ -38,11 +38,13 @@ class CONTENT_EXPORT UserMediaClientImpl : public RenderFrameObserver,
// the free store. http://crbug.com/764293
// |render_frame| and |dependency_factory| must outlive this instance.
UserMediaClientImpl(
- RenderFrame* render_frame,
+ RenderFrameImpl* render_frame,
PeerConnectionDependencyFactory* dependency_factory,
- std::unique_ptr<MediaStreamDeviceObserver> media_stream_device_observer);
- UserMediaClientImpl(RenderFrame* render_frame,
- std::unique_ptr<UserMediaProcessor> user_media_processor);
+ std::unique_ptr<MediaStreamDeviceObserver> media_stream_device_observer,
+ scoped_refptr<base::SingleThreadTaskRunner> task_runner);
+ UserMediaClientImpl(RenderFrameImpl* render_frame,
+ std::unique_ptr<UserMediaProcessor> user_media_processor,
+ scoped_refptr<base::SingleThreadTaskRunner> task_runner);
~UserMediaClientImpl() override;
MediaStreamDeviceObserver* media_stream_device_observer() const {