diff options
Diffstat (limited to 'media/cast/cast_environment.cc')
-rw-r--r-- | media/cast/cast_environment.cc | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/media/cast/cast_environment.cc b/media/cast/cast_environment.cc index f22f0a4..e3def4f 100644 --- a/media/cast/cast_environment.cc +++ b/media/cast/cast_environment.cc @@ -10,14 +10,6 @@ using base::SingleThreadTaskRunner; -namespace { - -void DeleteLoggingOnMainThread(scoped_ptr<media::cast::LoggingImpl> logging) { - logging.reset(); -} - -} // namespace - namespace media { namespace cast { @@ -30,17 +22,9 @@ CastEnvironment::CastEnvironment( audio_thread_proxy_(audio_thread_proxy), video_thread_proxy_(video_thread_proxy), clock_(clock.Pass()), - logging_(new LoggingImpl) {} + logger_(this) {} -CastEnvironment::~CastEnvironment() { - // Logging must be deleted on the main thread. - if (main_thread_proxy_.get() && - !main_thread_proxy_->RunsTasksOnCurrentThread()) { - main_thread_proxy_->PostTask( - FROM_HERE, - base::Bind(&DeleteLoggingOnMainThread, base::Passed(&logging_))); - } -} +CastEnvironment::~CastEnvironment() {} bool CastEnvironment::PostTask(ThreadId identifier, const tracked_objects::Location& from_here, |