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

Side by Side Diff: content/browser/renderer_host/media/media_stream_manager.cc

Issue 2535043003: Fix MediaDevices* tests dependency on BrowserThread globals after ~BrowserThreadImpl(). (Closed)
Patch Set: +comment Created 4 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 unified diff | Download patch
« no previous file with comments | « content/browser/renderer_host/media/media_stream_manager.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/media/media_stream_manager.h" 5 #include "content/browser/renderer_host/media/media_stream_manager.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 1739 matching lines...) Expand 10 before | Expand all | Expand 10 after
1750 } 1750 }
1751 } 1751 }
1752 } 1752 }
1753 } 1753 }
1754 1754
1755 void MediaStreamManager::SetGenerateStreamCallbackForTesting( 1755 void MediaStreamManager::SetGenerateStreamCallbackForTesting(
1756 GenerateStreamTestCallback test_callback) { 1756 GenerateStreamTestCallback test_callback) {
1757 generate_stream_test_callback_ = test_callback; 1757 generate_stream_test_callback_ = test_callback;
1758 } 1758 }
1759 1759
1760 #if defined(OS_WIN)
1761 void MediaStreamManager::FlushVideoCaptureThreadForTesting() {
1762 video_capture_thread_.FlushForTesting();
1763 }
1764 #endif
1765
1760 } // namespace content 1766 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/media/media_stream_manager.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698