Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1416)

Unified Diff: mojo/embedder/embedder.cc

Issue 502573006: Remove implicit conversions from scoped_refptr to T* in mojo/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mojo/embedder/embedder.cc
diff --git a/mojo/embedder/embedder.cc b/mojo/embedder/embedder.cc
index f51987cc53cbb41535f2584fb4dd72fe2f433182..1f94d596c61a74a98d2b8e249d88129331404391 100644
--- a/mojo/embedder/embedder.cc
+++ b/mojo/embedder/embedder.cc
@@ -89,7 +89,7 @@ void CreateChannelHelper(
MakeChannel(core, platform_handle.Pass(), message_pipe);
// Hand the channel back to the embedder.
- if (callback_thread_task_runner) {
+ if (callback_thread_task_runner.get()) {
callback_thread_task_runner->PostTask(
FROM_HERE, base::Bind(callback, channel_info.release()));
} else {
@@ -155,8 +155,8 @@ ScopedMessagePipeHandle CreateChannel(
callback,
callback_thread_task_runner));
} else {
- (callback_thread_task_runner ? callback_thread_task_runner
- : io_thread_task_runner)
+ (callback_thread_task_runner.get() ? callback_thread_task_runner
+ : io_thread_task_runner)
->PostTask(FROM_HERE, base::Bind(callback, channel_info.release()));
}
@@ -165,7 +165,7 @@ ScopedMessagePipeHandle CreateChannel(
void DestroyChannelOnIOThread(ChannelInfo* channel_info) {
DCHECK(channel_info);
- if (!channel_info->channel) {
+ if (!channel_info->channel.get()) {
// Presumably, |Init()| on the channel failed.
return;
}
@@ -177,9 +177,9 @@ void DestroyChannelOnIOThread(ChannelInfo* channel_info) {
// TODO(vtl): Write tests for this.
void DestroyChannel(ChannelInfo* channel_info) {
DCHECK(channel_info);
- DCHECK(channel_info->io_thread_task_runner);
+ DCHECK(channel_info->io_thread_task_runner.get());
- if (!channel_info->channel) {
+ if (!channel_info->channel.get()) {
// Presumably, |Init()| on the channel failed.
return;
}
@@ -223,7 +223,7 @@ MojoResult PassWrappedPlatformHandle(MojoHandle platform_handle_wrapper_handle,
DCHECK(core);
scoped_refptr<system::Dispatcher> dispatcher(
core->GetDispatcher(platform_handle_wrapper_handle));
- if (!dispatcher)
+ if (!dispatcher.get())
return MOJO_RESULT_INVALID_ARGUMENT;
if (dispatcher->GetType() != system::Dispatcher::kTypePlatformHandle)

Powered by Google App Engine
This is Rietveld 408576698