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

Unified Diff: content/browser/renderer_host/media/video_capture_host_unittest.cc

Issue 54863002: Implement a salt for MediaSource IDs that can be cleared by a user. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed jois nit. Created 7 years 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: content/browser/renderer_host/media/video_capture_host_unittest.cc
diff --git a/content/browser/renderer_host/media/video_capture_host_unittest.cc b/content/browser/renderer_host/media/video_capture_host_unittest.cc
index 9d9ab8c4c743294cc11938ba18e9c660e4247e15..8d4eb1ff226834315f30b5ea2ec964ff55427ba8 100644
--- a/content/browser/renderer_host/media/video_capture_host_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_host_unittest.cc
@@ -20,7 +20,9 @@
#include "content/browser/renderer_host/media/video_capture_manager.h"
#include "content/common/media/video_capture_messages.h"
#include "content/public/test/mock_resource_context.h"
+#include "content/public/test/test_browser_context.h"
#include "content/public/test/test_browser_thread_bundle.h"
+#include "content/test/test_content_browser_client.h"
#include "media/audio/audio_manager.h"
#include "media/base/video_frame.h"
#include "media/video/capture/video_capture_types.h"
@@ -243,6 +245,7 @@ class VideoCaptureHostTest : public testing::Test {
opened_session_id_(kInvalidMediaCaptureSessionId) {}
virtual void SetUp() OVERRIDE {
+ SetBrowserClientForTesting(&browser_client_);
// Create our own MediaStreamManager.
audio_manager_.reset(media::AudioManager::Create());
media_stream_manager_.reset(new MediaStreamManager(audio_manager_.get()));
@@ -290,6 +293,7 @@ class VideoCaptureHostTest : public testing::Test {
&stream_requester_,
render_process_id,
render_view_id,
+ browser_context_.GetResourceContext(),
page_request_id,
MEDIA_DEVICE_VIDEO_CAPTURE,
security_origin);
@@ -312,6 +316,7 @@ class VideoCaptureHostTest : public testing::Test {
&stream_requester_,
render_process_id,
render_view_id,
+ browser_context_.GetResourceContext(),
page_request_id,
devices[0].device.id,
MEDIA_DEVICE_VIDEO_CAPTURE,
@@ -432,6 +437,8 @@ class VideoCaptureHostTest : public testing::Test {
scoped_ptr<media::AudioManager> audio_manager_;
scoped_ptr<MediaStreamManager> media_stream_manager_;
content::TestBrowserThreadBundle thread_bundle_;
+ content::TestBrowserContext browser_context_;
+ content::TestContentBrowserClient browser_client_;
scoped_refptr<base::MessageLoopProxy> message_loop_;
int opened_session_id_;
std::string opened_device_label_;
« no previous file with comments | « content/browser/renderer_host/media/media_stream_manager.cc ('k') | content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698