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

Unified Diff: content/browser/renderer_host/media/media_stream_manager.h

Issue 10919095: content_browsertests will now use fake webrtc devices. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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
« no previous file with comments | « no previous file | content/browser/renderer_host/media/media_stream_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/media/media_stream_manager.h
diff --git a/content/browser/renderer_host/media/media_stream_manager.h b/content/browser/renderer_host/media/media_stream_manager.h
index bb407cea0a373851c4a85a058f1fdd5b3730a0a1..9a8659682b52797824345b55bd6d35d681c4fcef 100644
--- a/content/browser/renderer_host/media/media_stream_manager.h
+++ b/content/browser/renderer_host/media/media_stream_manager.h
@@ -148,10 +148,12 @@ class CONTENT_EXPORT MediaStreamManager
// Used by unit test to make sure fake devices are used instead of a real
// devices, which is needed for server based testing.
- // TODO(xians): Remove this hack since we can create our own
- // MediaStreamManager in our unit tests.
void UseFakeDevice();
+ // Call to have all GenerateStream calls from now on use fake devices instead
+ // of real ones. This should NOT be used in production versions of Chrome.
+ static void AlwaysUseFakeDevice();
+
// This object gets deleted on the UI thread after the IO thread has been
// destroyed. So we need to know when IO thread is being destroyed so that
// we can delete VideoCaptureManager and AudioInputDeviceManager.
@@ -229,6 +231,9 @@ class CONTENT_EXPORT MediaStreamManager
// managers on the right thread.
MessageLoop* io_loop_;
+ // Static members.
+ static bool always_use_fake_devices_;
+
DISALLOW_COPY_AND_ASSIGN(MediaStreamManager);
};
« no previous file with comments | « no previous file | content/browser/renderer_host/media/media_stream_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698