Index: chrome/renderer/media/webrtc_logging_message_filter.cc |
diff --git a/content/renderer/media/webrtc_logging_message_filter.cc b/chrome/renderer/media/webrtc_logging_message_filter.cc |
similarity index 78% |
rename from content/renderer/media/webrtc_logging_message_filter.cc |
rename to chrome/renderer/media/webrtc_logging_message_filter.cc |
index 45f93f5e3ac625399184e41ce381970c7a201c66..21c6934bf2ee1307e1e19368a133582deda6c8fa 100644 |
--- a/content/renderer/media/webrtc_logging_message_filter.cc |
+++ b/chrome/renderer/media/webrtc_logging_message_filter.cc |
@@ -2,20 +2,19 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "content/renderer/media/webrtc_logging_message_filter.h" |
+#include "chrome/renderer/media/webrtc_logging_message_filter.h" |
#include "base/logging.h" |
#include "base/message_loop_proxy.h" |
-#include "content/common/media/webrtc_logging_messages.h" |
-#include "content/renderer/media/webrtc_logging_handler_impl.h" |
+#include "chrome/common/media/webrtc_logging_messages.h" |
+#include "chrome/renderer/media/webrtc_logging_handler_impl.h" |
#include "ipc/ipc_logging.h" |
-#include "third_party/libjingle/overrides/talk/base/logging.h" |
-namespace content { |
+namespace chrome { |
WebRtcLoggingMessageFilter::WebRtcLoggingMessageFilter( |
const scoped_refptr<base::MessageLoopProxy>& io_message_loop) |
- : logging_handler_(NULL), |
+ : logging_handler_(new WebRtcLoggingHandlerImpl(io_message_loop, this)), |
io_message_loop_(io_message_loop), |
channel_(NULL) { |
} |
@@ -53,11 +52,8 @@ void WebRtcLoggingMessageFilter::OnChannelClosing() { |
} |
void WebRtcLoggingMessageFilter::InitLogging( |
- WebRtcLoggingHandlerImpl* logging_handler, |
const std::string& app_session_id) { |
DCHECK(io_message_loop_->BelongsToCurrentThread()); |
- DCHECK(!logging_handler_); |
- logging_handler_ = logging_handler; |
Send(new WebRtcLoggingMsg_OpenLog(app_session_id)); |
} |
@@ -65,14 +61,12 @@ void WebRtcLoggingMessageFilter::OnLogOpened( |
base::SharedMemoryHandle handle, |
uint32 length) { |
DCHECK(io_message_loop_->BelongsToCurrentThread()); |
- if (logging_handler_) |
- logging_handler_->OnLogOpened(handle, length); |
+ logging_handler_->OnLogOpened(handle, length); |
} |
void WebRtcLoggingMessageFilter::OnOpenLogFailed() { |
DCHECK(io_message_loop_->BelongsToCurrentThread()); |
- if (logging_handler_) |
- logging_handler_->OnOpenLogFailed(); |
+ logging_handler_->OnOpenLogFailed(); |
} |
void WebRtcLoggingMessageFilter::Send(IPC::Message* message) { |
@@ -85,4 +79,4 @@ void WebRtcLoggingMessageFilter::Send(IPC::Message* message) { |
} |
} |
-} // namespace content |
+} // namespace chrome |