| 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 155de2787eecf56a65d027db7bc85e11f5819127..b491d11be781bb340ff4e6be416821d92ba3186c 100644
|
| --- a/content/renderer/media/webrtc_logging_message_filter.cc
|
| +++ b/chrome/renderer/media/webrtc_logging_message_filter.cc
|
| @@ -2,22 +2,23 @@
|
| // 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 {
|
|
|
| WebRtcLoggingMessageFilter::WebRtcLoggingMessageFilter(
|
| const scoped_refptr<base::MessageLoopProxy>& io_message_loop)
|
| : logging_handler_(NULL),
|
| io_message_loop_(io_message_loop),
|
| channel_(NULL) {
|
| + io_message_loop_->PostTask(
|
| + FROM_HERE, base::Bind(
|
| + &WebRtcLoggingMessageFilter::CreateLoggingHandler,
|
| + base::Unretained(this)));
|
| }
|
|
|
| WebRtcLoggingMessageFilter::~WebRtcLoggingMessageFilter() {
|
| @@ -53,27 +54,27 @@ void WebRtcLoggingMessageFilter::OnChannelClosing() {
|
| }
|
|
|
| void WebRtcLoggingMessageFilter::InitLogging(
|
| - WebRtcLoggingHandlerImpl* logging_handler,
|
| const std::string& app_session_id,
|
| const std::string& app_url) {
|
| DCHECK(io_message_loop_->BelongsToCurrentThread());
|
| - DCHECK(!logging_handler_);
|
| - logging_handler_ = logging_handler;
|
| Send(new WebRtcLoggingMsg_OpenLog(app_session_id, app_url));
|
| }
|
|
|
| +void WebRtcLoggingMessageFilter::CreateLoggingHandler() {
|
| + DCHECK(io_message_loop_->BelongsToCurrentThread());
|
| + logging_handler_ = new WebRtcLoggingHandlerImpl(io_message_loop_, this);
|
| +}
|
| +
|
| 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,5 +86,3 @@ void WebRtcLoggingMessageFilter::Send(IPC::Message* message) {
|
| channel_->Send(message);
|
| }
|
| }
|
| -
|
| -} // namespace content
|
|
|