Update content/ to use scoped_refptr<T>::get() rather than implicit "operator T*"

content/common_child/np_channel_base.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common_child/np_channel_base.h"
 
 #include <stack>
 
 #include "base/auto_reset.h"
 #include "base/hash_tables.h"
@@ skipping 21 matching lines @@
     bool create_pipe_now, base::WaitableEvent* shutdown_event) {
   scoped_refptr<NPChannelBase> channel;
   std::string channel_key = channel_handle.name;
   ChannelMap::const_iterator iter = g_channels.Get().find(channel_key);
   if (iter == g_channels.Get().end()) {
     channel = factory();
   } else {
     channel = iter->second;
   }
 
-  DCHECK(channel != NULL);
+  DCHECK(channel.get() != NULL);
 
   if (!channel->channel_valid()) {
     channel->channel_handle_ = channel_handle;
     if (mode & IPC::Channel::MODE_SERVER_FLAG) {
       channel->channel_handle_.name =
           IPC::Channel::GenerateVerifiedChannelID(channel_key);
     }
     channel->mode_ = mode;
     if (channel->Init(ipc_message_loop, create_pipe_now, shutdown_event)) {
       g_channels.Get()[channel_key] = channel;
     } else {
       channel = NULL;
     }
   }
 
-  return channel;
+  return channel.get();
 }
 
 void NPChannelBase::Broadcast(IPC::Message* message) {
   for (ChannelMap::iterator iter = g_channels.Get().begin();
        iter != g_channels.Get().end();
        ++iter) {
     iter->second->Send(new IPC::Message(*message));
   }
   delete message;
 }
 
 NPChannelBase::NPChannelBase()
     : mode_(IPC::Channel::MODE_NONE),
       non_npobject_count_(0),
       peer_pid_(0),
       in_remove_route_(false),
       channel_valid_(false),
       in_unblock_dispatch_(0),
       send_unblocking_only_during_unblock_dispatch_(false) {
 }
 
 NPChannelBase::~NPChannelBase() {
 }
 
 NPChannelBase* NPChannelBase::GetCurrentChannel() {
-  return g_lazy_channel_stack.Pointer()->top();
+  return g_lazy_channel_stack.Pointer()->top().get();
 }
 
 void NPChannelBase::CleanupChannels() {
   // Make a copy of the references as we can't iterate the map since items will
   // be removed from it as we clean them up.
   std::vector<scoped_refptr<NPChannelBase> > channels;
   for (ChannelMap::const_iterator iter = g_channels.Get().begin();
        iter != g_channels.Get().end();
        ++iter) {
     channels.push_back(iter->second);
@@ skipping 135 matching lines @@
     base::AutoReset<bool> auto_reset_in_remove_route(&in_remove_route_, true);
     for (ListenerMap::iterator npobj_iter = npobject_listeners_.begin();
          npobj_iter != npobject_listeners_.end(); ++npobj_iter) {
       if (npobj_iter->second) {
         npobj_iter->second->GetChannelListener()->OnChannelError();
       }
     }
 
     for (ChannelMap::iterator iter = g_channels.Get().begin();
          iter != g_channels.Get().end(); ++iter) {
-      if (iter->second == this) {
+      if (iter->second.get() == this) {
         g_channels.Get().erase(iter);
         return;
       }
     }
 
     NOTREACHED();
   }
 }
 
 bool NPChannelBase::OnControlMessageReceived(const IPC::Message& msg) {
   NOTREACHED() <<
       "should override in subclass if you care about control messages";
   return false;
 }
 
 void NPChannelBase::OnChannelError() {
   channel_valid_ = false;
 
   // TODO(shess): http://crbug.com/97285
   // Once an error is seen on a channel, remap the channel to prevent
   // it from being vended again.  Keep the channel in the map so
   // RemoveRoute() can clean things up correctly.
   for (ChannelMap::iterator iter = g_channels.Get().begin();
        iter != g_channels.Get().end(); ++iter) {
-    if (iter->second == this) {
+    if (iter->second.get() == this) {
       // Insert new element before invalidating |iter|.
       g_channels.Get()[iter->first + "-error"] = iter->second;
       g_channels.Get().erase(iter);
       break;
     }
   }
 }
 
 NPObject* NPChannelBase::GetExistingNPObjectProxy(int route_id) {
   ProxyMap::iterator iter = proxy_map_.find(route_id);
@@ skipping 20 matching lines @@
                                                  NPObject* object) {
   DCHECK(object != NULL);
   stub_map_.erase(object);
 }
 
 void NPChannelBase::RemoveMappingForNPObjectProxy(int route_id) {
   proxy_map_.erase(route_id);
 }
 
 }  // namespace content