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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 216473002: Replace DCHECK(BrowserThread::CurrentlyOn) with DCHECK_CURRENTLY_ON in content/browser/renderer_hos… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync to r260263 Created 6 years, 9 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 | « content/browser/renderer_host/media/media_stream_dispatcher_host.cc ('k') | content/browser/renderer_host/media/media_stream_ui_proxy.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.cc
diff --git a/content/browser/renderer_host/media/media_stream_manager.cc b/content/browser/renderer_host/media/media_stream_manager.cc
index 2740db470fa507400ff2107381a5922364e7531e..cabdb0577ac5283b03331dcbf957b739a98727ca 100644
--- a/content/browser/renderer_host/media/media_stream_manager.cc
+++ b/content/browser/renderer_host/media/media_stream_manager.cc
@@ -119,7 +119,7 @@ void ParseStreamType(const StreamOptions& options,
// webrtcLoggingPrivate API.
void DoAddLogMessage(const std::string& message) {
// Must be on the UI thread to access BrowserMainLoop.
- DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
// May be null in tests.
// TODO(vrk): Handle this more elegantly by having native log messages become
// no-ops until MediaStreamManager is aware that a renderer process has
@@ -368,13 +368,13 @@ MediaStreamManager::~MediaStreamManager() {
}
VideoCaptureManager* MediaStreamManager::video_capture_manager() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
DCHECK(video_capture_manager_.get());
return video_capture_manager_.get();
}
AudioInputDeviceManager* MediaStreamManager::audio_input_device_manager() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
DCHECK(audio_input_device_manager_.get());
return audio_input_device_manager_.get();
}
@@ -386,7 +386,7 @@ std::string MediaStreamManager::MakeMediaAccessRequest(
const StreamOptions& options,
const GURL& security_origin,
const MediaRequestResponseCallback& callback) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
// TODO(perkj): The argument list with NULL parameters to DeviceRequest
// suggests that this is the wrong design. Can this be refactored?
@@ -423,7 +423,7 @@ void MediaStreamManager::GenerateStream(MediaStreamRequester* requester,
const StreamOptions& options,
const GURL& security_origin,
bool user_gesture) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
DVLOG(1) << "GenerateStream()";
if (CommandLine::ForCurrentProcess()->HasSwitch(
switches::kUseFakeUIForMediaStream)) {
@@ -470,7 +470,7 @@ void MediaStreamManager::CancelRequest(int render_process_id,
}
void MediaStreamManager::CancelRequest(const std::string& label) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
DVLOG(1) << "CancelRequest({label = " << label << "})";
DeviceRequest* request = FindRequest(label);
if (!request) {
@@ -524,7 +524,7 @@ void MediaStreamManager::CancelAllRequests(int render_process_id) {
void MediaStreamManager::StopStreamDevice(int render_process_id,
int render_view_id,
const std::string& device_id) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
DVLOG(1) << "StopStreamDevice({render_view_id = " << render_view_id << "} "
<< ", {device_id = " << device_id << "})";
// Find the first request for this |render_process_id| and |render_view_id|
@@ -618,7 +618,7 @@ std::string MediaStreamManager::EnumerateDevices(
int page_request_id,
MediaStreamType type,
const GURL& security_origin) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
DCHECK(requester);
DCHECK(type == MEDIA_DEVICE_AUDIO_CAPTURE ||
type == MEDIA_DEVICE_VIDEO_CAPTURE);
@@ -651,7 +651,7 @@ std::string MediaStreamManager::EnumerateDevices(
}
void MediaStreamManager::DoEnumerateDevices(const std::string& label) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
DeviceRequest* request = FindRequest(label);
if (!request)
return; // This can happen if the request has been canceled.
@@ -687,7 +687,7 @@ void MediaStreamManager::OpenDevice(MediaStreamRequester* requester,
const std::string& device_id,
MediaStreamType type,
const GURL& security_origin) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
DCHECK(type == MEDIA_DEVICE_AUDIO_CAPTURE ||
type == MEDIA_DEVICE_VIDEO_CAPTURE);
DVLOG(1) << "OpenDevice ({page_request_id = " << page_request_id << "})";
@@ -726,7 +726,7 @@ void MediaStreamManager::OpenDevice(MediaStreamRequester* requester,
}
void MediaStreamManager::EnsureDeviceMonitorStarted() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
StartMonitoring();
}
@@ -786,7 +786,7 @@ void MediaStreamManager::StopRemovedDevice(const MediaStreamDevice& device) {
}
void MediaStreamManager::StartMonitoring() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (monitoring_started_)
return;
@@ -813,7 +813,7 @@ void MediaStreamManager::StartMonitoring() {
#if defined(OS_MACOSX)
void MediaStreamManager::StartMonitoringOnUIThread() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
BrowserMainLoop* browser_main_loop = content::BrowserMainLoop::GetInstance();
if (browser_main_loop)
browser_main_loop->device_monitor_mac()->StartMonitoring();
@@ -958,7 +958,7 @@ bool MediaStreamManager::EnumerationRequired(EnumerationCache* cache,
}
void MediaStreamManager::StartEnumeration(DeviceRequest* request) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
// Start monitoring the devices when doing the first enumeration.
StartMonitoring();
@@ -979,7 +979,7 @@ void MediaStreamManager::StartEnumeration(DeviceRequest* request) {
}
std::string MediaStreamManager::AddRequest(DeviceRequest* request) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
// Create a label for this request and verify it is unique.
std::string unique_label;
@@ -1007,7 +1007,7 @@ void MediaStreamManager::DeleteRequest(const std::string& label) {
void MediaStreamManager::PostRequestToUI(const std::string& label,
DeviceRequest* request) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
DCHECK(request->UIRequest());
DVLOG(1) << "PostRequestToUI({label= " << label << "})";
@@ -1054,7 +1054,7 @@ void MediaStreamManager::PostRequestToUI(const std::string& label,
}
void MediaStreamManager::SetupRequest(const std::string& label) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
DeviceRequest* request = FindRequest(label);
if (!request) {
DVLOG(1) << "SetupRequest label " << label << " doesn't exist!!";
@@ -1339,7 +1339,7 @@ void MediaStreamManager::FinalizeOpenDevice(const std::string& label,
void MediaStreamManager::FinalizeEnumerateDevices(const std::string& label,
DeviceRequest* request) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
DCHECK_EQ(request->request_type, MEDIA_ENUMERATE_DEVICES);
if (request->security_origin.is_valid()) {
@@ -1399,7 +1399,7 @@ void MediaStreamManager::FinalizeMediaAccessRequest(
}
void MediaStreamManager::InitializeDeviceManagersOnIOThread() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (device_task_runner_)
return;
@@ -1425,7 +1425,7 @@ void MediaStreamManager::InitializeDeviceManagersOnIOThread() {
void MediaStreamManager::Opened(MediaStreamType stream_type,
int capture_session_id) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
DVLOG(1) << "Opened({stream_type = " << stream_type << "} "
<< "{capture_session_id = " << capture_session_id << "})";
// Find the request(s) containing this device and mark it as used.
@@ -1498,12 +1498,12 @@ void MediaStreamManager::HandleRequestDone(const std::string& label,
void MediaStreamManager::Closed(MediaStreamType stream_type,
int capture_session_id) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
}
void MediaStreamManager::DevicesEnumerated(
MediaStreamType stream_type, const StreamDeviceInfoArray& devices) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
DVLOG(1) << "DevicesEnumerated("
<< "{stream_type = " << stream_type << "})" << std::endl;
@@ -1594,7 +1594,7 @@ void MediaStreamManager::SendMessageToNativeLog(const std::string& message) {
void MediaStreamManager::AddLogMessageOnIOThread(const std::string& message) {
// Get render process ids on the IO thread.
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
// Grab all unique process ids that request a MediaStream or have a
// MediaStream running.
@@ -1623,7 +1623,7 @@ void MediaStreamManager::AddLogMessageOnUIThread(
const std::string& message) {
#if defined(ENABLE_WEBRTC)
// Must be on the UI thread to access RenderProcessHost from process ID.
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
for (std::set<int>::const_iterator it = requesting_process_ids.begin();
it != requesting_process_ids.end(); ++it) {
@@ -1642,7 +1642,7 @@ void MediaStreamManager::HandleAccessRequestResponse(
const std::string& label,
const MediaStreamDevices& devices,
content::MediaStreamRequestResult result) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
DVLOG(1) << "HandleAccessRequestResponse("
<< ", {label = " << label << "})";
@@ -1744,7 +1744,7 @@ void MediaStreamManager::HandleAccessRequestResponse(
}
void MediaStreamManager::StopMediaStreamFromBrowser(const std::string& label) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
DeviceRequest* request = FindRequest(label);
if (!request)
@@ -1764,13 +1764,13 @@ void MediaStreamManager::StopMediaStreamFromBrowser(const std::string& label) {
}
void MediaStreamManager::UseFakeDevice() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
video_capture_manager()->UseFakeDevice();
audio_input_device_manager()->UseFakeDevice();
}
void MediaStreamManager::UseFakeUI(scoped_ptr<FakeMediaStreamUIProxy> fake_ui) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
use_fake_ui_ = true;
fake_ui_ = fake_ui.Pass();
}
@@ -1794,7 +1794,7 @@ void MediaStreamManager::WillDestroyCurrentMessageLoop() {
void MediaStreamManager::NotifyDevicesChanged(
MediaStreamType stream_type,
const StreamDeviceInfoArray& devices) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
MediaObserver* media_observer =
GetContentClient()->browser()->GetMediaObserver();
if (media_observer == NULL)
@@ -1821,7 +1821,7 @@ void MediaStreamManager::NotifyDevicesChanged(
}
bool MediaStreamManager::RequestDone(const DeviceRequest& request) const {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
const bool requested_audio = IsAudioMediaType(request.audio_type());
const bool requested_video = IsVideoMediaType(request.video_type());
@@ -1856,7 +1856,7 @@ MediaStreamProvider* MediaStreamManager::GetDeviceManager(
void MediaStreamManager::OnDevicesChanged(
base::SystemMonitor::DeviceType device_type) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
// NOTE: This method is only called in response to physical audio/video device
// changes (from the operating system).
@@ -1880,7 +1880,7 @@ void MediaStreamManager::OnDevicesChanged(
void MediaStreamManager::OnMediaStreamUIWindowId(MediaStreamType video_type,
StreamDeviceInfoArray devices,
gfx::NativeViewId window_id) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (!window_id)
return;
« no previous file with comments | « content/browser/renderer_host/media/media_stream_dispatcher_host.cc ('k') | content/browser/renderer_host/media/media_stream_ui_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698