Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / renderer / media / webrtc_logging_message_filter.cc

diff --git a/src/chrome/renderer/media/webrtc_logging_message_filter.cc b/src/chrome/renderer/media/webrtc_logging_message_filter.cc
index 83ad4d6..4669df0 100644 (file)
--- a/src/chrome/renderer/media/webrtc_logging_message_filter.cc
+++ b/src/chrome/renderer/media/webrtc_logging_message_filter.cc
@@ -14,9 +14,9 @@ WebRtcLoggingMessageFilter::WebRtcLoggingMessageFilter(
     const scoped_refptr<base::MessageLoopProxy>& io_message_loop)
     : io_message_loop_(io_message_loop),
       log_message_delegate_(NULL),
-      channel_(NULL) {
+      sender_(NULL) {
   // May be null in a browsertest using MockRenderThread.
-  if (io_message_loop_) {
+  if (io_message_loop_.get()) {
     io_message_loop_->PostTask(
         FROM_HERE, base::Bind(
             &WebRtcLoggingMessageFilter::CreateLoggingHandler,
@@ -39,20 +39,20 @@ bool WebRtcLoggingMessageFilter::OnMessageReceived(
   return handled;
 }
 
-void WebRtcLoggingMessageFilter::OnFilterAdded(IPC::Channel* channel) {
-  DCHECK(!io_message_loop_ || io_message_loop_->BelongsToCurrentThread());
-  channel_ = channel;
+void WebRtcLoggingMessageFilter::OnFilterAdded(IPC::Sender* sender) {
+  DCHECK(!io_message_loop_.get() || io_message_loop_->BelongsToCurrentThread());
+  sender_ = sender;
 }
 
 void WebRtcLoggingMessageFilter::OnFilterRemoved() {
-  DCHECK(!io_message_loop_ || io_message_loop_->BelongsToCurrentThread());
-  channel_ = NULL;
+  DCHECK(!io_message_loop_.get() || io_message_loop_->BelongsToCurrentThread());
+  sender_ = NULL;
   log_message_delegate_->OnFilterRemoved();
 }
 
 void WebRtcLoggingMessageFilter::OnChannelClosing() {
-  DCHECK(!io_message_loop_ || io_message_loop_->BelongsToCurrentThread());
-  channel_ = NULL;
+  DCHECK(!io_message_loop_.get() || io_message_loop_->BelongsToCurrentThread());
+  sender_ = NULL;
   log_message_delegate_->OnFilterRemoved();
 }
 
@@ -63,32 +63,32 @@ void WebRtcLoggingMessageFilter::AddLogMessages(
 }
 
 void WebRtcLoggingMessageFilter::LoggingStopped() {
-  DCHECK(!io_message_loop_ || io_message_loop_->BelongsToCurrentThread());
+  DCHECK(!io_message_loop_.get() || io_message_loop_->BelongsToCurrentThread());
   Send(new WebRtcLoggingMsg_LoggingStopped());
 }
 
 void WebRtcLoggingMessageFilter::CreateLoggingHandler() {
-  DCHECK(!io_message_loop_ || io_message_loop_->BelongsToCurrentThread());
+  DCHECK(!io_message_loop_.get() || io_message_loop_->BelongsToCurrentThread());
   log_message_delegate_ =
       new ChromeWebRtcLogMessageDelegate(io_message_loop_, this);
 }
 
 void WebRtcLoggingMessageFilter::OnStartLogging() {
-  DCHECK(!io_message_loop_ || io_message_loop_->BelongsToCurrentThread());
+  DCHECK(!io_message_loop_.get() || io_message_loop_->BelongsToCurrentThread());
   log_message_delegate_->OnStartLogging();
 }
 
 void WebRtcLoggingMessageFilter::OnStopLogging() {
-  DCHECK(!io_message_loop_ || io_message_loop_->BelongsToCurrentThread());
+  DCHECK(!io_message_loop_.get() || io_message_loop_->BelongsToCurrentThread());
   log_message_delegate_->OnStopLogging();
 }
 
 void WebRtcLoggingMessageFilter::Send(IPC::Message* message) {
-  DCHECK(!io_message_loop_ || io_message_loop_->BelongsToCurrentThread());
-  if (!channel_) {
-    DLOG(ERROR) << "IPC channel not available.";
+  DCHECK(!io_message_loop_.get() || io_message_loop_->BelongsToCurrentThread());
+  if (!sender_) {
+    DLOG(ERROR) << "IPC sender not available.";
     delete message;
   } else {
-    channel_->Send(message);
+    sender_->Send(message);
   }
 }