diff options
| author | dcheng <dcheng@chromium.org> | 2014-08-26 19:25:08 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-27 02:26:17 +0000 |
| commit | d048bd27d5abdc271b10df7d3b434f9b9dd767d3 (patch) | |
| tree | cd2f30125ee53e49ab201b77968bcf0111521e92 /media/cast/cast_environment.cc | |
| parent | fda68628ff5b7158c4d2cf20853e6221e253dd06 (diff) | |
| download | chromium_src-d048bd27d5abdc271b10df7d3b434f9b9dd767d3.zip chromium_src-d048bd27d5abdc271b10df7d3b434f9b9dd767d3.tar.gz chromium_src-d048bd27d5abdc271b10df7d3b434f9b9dd767d3.tar.bz2 | |
Remove implicit conversions from scoped_refptr to T* in media/
This patch was generated by running the rewrite_scoped_refptr clang tool
on a Linux build.
BUG=110610
Review URL: https://codereview.chromium.org/506683002
Cr-Commit-Position: refs/heads/master@{#292082}
Diffstat (limited to 'media/cast/cast_environment.cc')
| -rw-r--r-- | media/cast/cast_environment.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/media/cast/cast_environment.cc b/media/cast/cast_environment.cc index 93eb8c7..f22f0a4 100644 --- a/media/cast/cast_environment.cc +++ b/media/cast/cast_environment.cc @@ -34,7 +34,8 @@ CastEnvironment::CastEnvironment( CastEnvironment::~CastEnvironment() { // Logging must be deleted on the main thread. - if (main_thread_proxy_ && !main_thread_proxy_->RunsTasksOnCurrentThread()) { + if (main_thread_proxy_.get() && + !main_thread_proxy_->RunsTasksOnCurrentThread()) { main_thread_proxy_->PostTask( FROM_HERE, base::Bind(&DeleteLoggingOnMainThread, base::Passed(&logging_))); @@ -73,13 +74,13 @@ scoped_refptr<SingleThreadTaskRunner> CastEnvironment::GetTaskRunner( bool CastEnvironment::CurrentlyOn(ThreadId identifier) { switch (identifier) { case CastEnvironment::MAIN: - return main_thread_proxy_ && + return main_thread_proxy_.get() && main_thread_proxy_->RunsTasksOnCurrentThread(); case CastEnvironment::AUDIO: - return audio_thread_proxy_ && + return audio_thread_proxy_.get() && audio_thread_proxy_->RunsTasksOnCurrentThread(); case CastEnvironment::VIDEO: - return video_thread_proxy_ && + return video_thread_proxy_.get() && video_thread_proxy_->RunsTasksOnCurrentThread(); default: NOTREACHED() << "Invalid thread identifier"; |