Mojo: Remove implicit scoped_refptr<T> -> T* conversions in mojo/.

R=yzshen@chromium.org

Review URL: https://codereview.chromium.org/190973008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255800 0039d316-1c4b-4281-b951-d872f2087c98

mojo/common/handle_watcher.cc

@@ -197,7 +197,8 @@ WatcherID WatcherThreadManager::StartWatching(
   data.wait_flags = wait_flags;
   data.deadline = deadline;
   data.message_loop = base::MessageLoopProxy::current();
-  DCHECK_NE(static_cast<base::MessageLoopProxy*>(NULL), data.message_loop);
+  DCHECK_NE(static_cast<base::MessageLoopProxy*>(NULL),
+            data.message_loop.get());
   // We outlive |thread_|, so it's safe to use Unretained() here.
   thread_.message_loop()->PostTask(
       FROM_HERE,

mojo/system/message_in_transit.cc

@@ -175,7 +175,7 @@ void MessageInTransit::SerializeAndCloseDispatchers(Channel* channel) {
   // table, and add to it as we go along.
   size_t size = handle_table_size;
   for (size_t i = 0; i < dispatchers_->size(); i++) {
-    if (Dispatcher* dispatcher = (*dispatchers_)[i]) {
+    if (Dispatcher* dispatcher = (*dispatchers_)[i].get()) {
       size += RoundUpMessageAlignment(
           Dispatcher::MessageInTransitAccess::GetMaximumSerializedSize(
               dispatcher, channel));
@@ -195,10 +195,10 @@ void MessageInTransit::SerializeAndCloseDispatchers(Channel* channel) {
       static_cast<HandleTableEntry*>(secondary_buffer_);
   size_t current_offset = handle_table_size;
   for (size_t i = 0; i < dispatchers_->size(); i++) {
-    Dispatcher* dispatcher = (*dispatchers_)[i];
+    Dispatcher* dispatcher = (*dispatchers_)[i].get();
     if (!dispatcher) {
       COMPILE_ASSERT(Dispatcher::kTypeUnknown == 0,
-                     need_Dispatcher_kTypeUnknown_to_be_zero);
+                     value_of_Dispatcher_kTypeUnknown_must_be_zero);
       continue;
     }