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

Unified Diff: chrome/renderer/media/webrtc_logging_message_filter.cc

Issue 23455047: InstantExtended: Send search URLs to renderers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More browsertest fixes Created 7 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
Index: chrome/renderer/media/webrtc_logging_message_filter.cc
diff --git a/chrome/renderer/media/webrtc_logging_message_filter.cc b/chrome/renderer/media/webrtc_logging_message_filter.cc
index be4f665286cbefbc9ff9cce3e6efcce3d6501228..6475ea30710b6793326981b93f96ed5418d8444a 100644
--- a/chrome/renderer/media/webrtc_logging_message_filter.cc
+++ b/chrome/renderer/media/webrtc_logging_message_filter.cc
@@ -15,10 +15,13 @@ WebRtcLoggingMessageFilter::WebRtcLoggingMessageFilter(
: log_message_delegate_(NULL),
io_message_loop_(io_message_loop),
channel_(NULL) {
- io_message_loop_->PostTask(
- FROM_HERE, base::Bind(
- &WebRtcLoggingMessageFilter::CreateLoggingHandler,
- base::Unretained(this)));
+ // May be null in a browsertest using MockRenderThread.
+ if (io_message_loop_) {
+ io_message_loop_->PostTask(
+ FROM_HERE, base::Bind(
+ &WebRtcLoggingMessageFilter::CreateLoggingHandler,
+ base::Unretained(this)));
+ }
}
WebRtcLoggingMessageFilter::~WebRtcLoggingMessageFilter() {
@@ -37,18 +40,18 @@ bool WebRtcLoggingMessageFilter::OnMessageReceived(
}
void WebRtcLoggingMessageFilter::OnFilterAdded(IPC::Channel* channel) {
- DCHECK(io_message_loop_->BelongsToCurrentThread());
+ DCHECK(!io_message_loop_ || io_message_loop_->BelongsToCurrentThread());
channel_ = channel;
}
void WebRtcLoggingMessageFilter::OnFilterRemoved() {
- DCHECK(io_message_loop_->BelongsToCurrentThread());
+ DCHECK(!io_message_loop_ || io_message_loop_->BelongsToCurrentThread());
channel_ = NULL;
log_message_delegate_->OnFilterRemoved();
}
void WebRtcLoggingMessageFilter::OnChannelClosing() {
- DCHECK(io_message_loop_->BelongsToCurrentThread());
+ DCHECK(!io_message_loop_ || io_message_loop_->BelongsToCurrentThread());
channel_ = NULL;
log_message_delegate_->OnFilterRemoved();
}
@@ -56,12 +59,12 @@ void WebRtcLoggingMessageFilter::OnChannelClosing() {
void WebRtcLoggingMessageFilter::InitLogging(
const std::string& app_session_id,
const std::string& app_url) {
- DCHECK(io_message_loop_->BelongsToCurrentThread());
+ DCHECK(!io_message_loop_ || io_message_loop_->BelongsToCurrentThread());
Send(new WebRtcLoggingMsg_OpenLog(app_session_id, app_url));
}
void WebRtcLoggingMessageFilter::CreateLoggingHandler() {
- DCHECK(io_message_loop_->BelongsToCurrentThread());
+ DCHECK(!io_message_loop_ || io_message_loop_->BelongsToCurrentThread());
log_message_delegate_ =
new ChromeWebRtcLogMessageDelegate(io_message_loop_, this);
}
@@ -69,17 +72,17 @@ void WebRtcLoggingMessageFilter::CreateLoggingHandler() {
void WebRtcLoggingMessageFilter::OnLogOpened(
base::SharedMemoryHandle handle,
uint32 length) {
- DCHECK(io_message_loop_->BelongsToCurrentThread());
+ DCHECK(!io_message_loop_ || io_message_loop_->BelongsToCurrentThread());
log_message_delegate_->OnLogOpened(handle, length);
}
void WebRtcLoggingMessageFilter::OnOpenLogFailed() {
- DCHECK(io_message_loop_->BelongsToCurrentThread());
+ DCHECK(!io_message_loop_ || io_message_loop_->BelongsToCurrentThread());
log_message_delegate_->OnOpenLogFailed();
}
void WebRtcLoggingMessageFilter::Send(IPC::Message* message) {
- DCHECK(io_message_loop_->BelongsToCurrentThread());
+ DCHECK(!io_message_loop_ || io_message_loop_->BelongsToCurrentThread());
if (!channel_) {
DLOG(ERROR) << "IPC channel not available.";
delete message;
« no previous file with comments | « chrome/renderer/chrome_content_renderer_client_unittest.cc ('k') | chrome/renderer/searchbox/search_bouncer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698