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

content/common_child/npobject_proxy.cc

 // Copyright (c) 2011 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/npobject_proxy.h"
 
 #include "content/common_child/np_channel_base.h"
 #include "content/common_child/npobject_util.h"
 #include "content/common_child/plugin_messages.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
@@ skipping 52 matching lines @@
     int render_view_id,
     const GURL& page_url)
     : channel_(channel),
       route_id_(route_id),
       render_view_id_(render_view_id),
       page_url_(page_url) {
   channel_->AddRoute(route_id, this, this);
 }
 
 NPObjectProxy::~NPObjectProxy() {
-  if (channel_) {
+  if (channel_.get()) {
     // This NPObjectProxy instance is now invalid and should not be reused for
     // requests initiated by plugins. We may receive requests for the
     // same NPObject in the context of the outgoing NPObjectMsg_Release call.
     // We should be creating new NPObjectProxy instances to wrap these
     // NPObjects.
     channel_->RemoveMappingForNPObjectProxy(route_id_);
     channel_->RemoveRoute(route_id_);
     Send(new NPObjectMsg_Release(route_id_));
   }
 }
 
 NPObject* NPObjectProxy::Create(NPChannelBase* channel,
                                 int route_id,
                                 int render_view_id,
                                 const GURL& page_url) {
   NPObjectWrapper* obj = reinterpret_cast<NPObjectWrapper*>(
       WebBindings::createObject(0, &npclass_proxy_));
   obj->proxy = new NPObjectProxy(channel, route_id, render_view_id, page_url);
   channel->AddMappingForNPObjectProxy(route_id, &obj->object);
   return reinterpret_cast<NPObject*>(obj);
 }
 
 bool NPObjectProxy::Send(IPC::Message* msg) {
-  if (channel_)
+  if (channel_.get())
     return channel_->Send(msg);
 
   delete msg;
   return false;
 }
 
 NPObject* NPObjectProxy::NPAllocate(NPP, NPClass*) {
   return reinterpret_cast<NPObject*>(new NPObjectWrapper);
 }
 
@@ skipping 78 matching lines @@
   } else {
     CreateNPIdentifierParam(name, &name_param);
   }
 
   // Note: This instance can get destroyed in the context of
   // Send so addref the channel in this scope.
   scoped_refptr<NPChannelBase> channel_copy = proxy->channel_;
   std::vector<NPVariant_Param> args_param;
   for (unsigned int i = 0; i < arg_count; ++i) {
     NPVariant_Param param;
-    CreateNPVariantParam(
-        args[i], channel_copy, &param, false, render_view_id,
-        proxy->page_url_);
+    CreateNPVariantParam(args[i],
+                         channel_copy.get(),
+                         &param,
+                         false,
+                         render_view_id,
+                         proxy->page_url_);
     args_param.push_back(param);
   }
 
   NPVariant_Param param_result;
   NPObjectMsg_Invoke* msg = new NPObjectMsg_Invoke(
       proxy->route_id_, is_default, name_param, args_param, &param_result,
       &result);
 
   // If we're in the plugin process and this invoke leads to a dialog box, the
   // plugin will hang the window hierarchy unless we pump the window message
   // queue while waiting for a reply.  We need to do this to simulate what
   // happens when everything runs in-process (while calling MessageBox window
   // messages are pumped).
   if (IsPluginProcess() && proxy->channel()) {
     msg->set_pump_messages_event(
         proxy->channel()->GetModalDialogEvent(render_view_id));
   }
 
   GURL page_url = proxy->page_url_;
   proxy->Send(msg);
 
   // Send may delete proxy.
   proxy = NULL;
 
   if (!result)
     return false;
 
   CreateNPVariant(
-      param_result, channel_copy, np_result, render_view_id, page_url);
+      param_result, channel_copy.get(), np_result, render_view_id, page_url);
   return true;
 }
 
 bool NPObjectProxy::NPHasProperty(NPObject *obj,
                                   NPIdentifier name) {
   if (obj == NULL)
     return false;
 
   bool result = false;
   NPObjectProxy* proxy = GetProxy(obj);
@@ skipping 174 matching lines @@
 
   bool result = false;
   int render_view_id = proxy->render_view_id_;
 
   // Note: This instance can get destroyed in the context of
   // Send so addref the channel in this scope.
   scoped_refptr<NPChannelBase> channel_copy = proxy->channel_;
   std::vector<NPVariant_Param> args_param;
   for (unsigned int i = 0; i < arg_count; ++i) {
     NPVariant_Param param;
-    CreateNPVariantParam(
-        args[i], channel_copy, &param, false, render_view_id,
-        proxy->page_url_);
+    CreateNPVariantParam(args[i],
+                         channel_copy.get(),
+                         &param,
+                         false,
+                         render_view_id,
+                         proxy->page_url_);
     args_param.push_back(param);
   }
 
   NPVariant_Param param_result;
   NPObjectMsg_Construct* msg = new NPObjectMsg_Construct(
       proxy->route_id_, args_param, &param_result, &result);
 
   // See comment in NPObjectProxy::NPInvokePrivate.
   if (IsPluginProcess() && proxy->channel()) {
     msg->set_pump_messages_event(
         proxy->channel()->GetModalDialogEvent(proxy->render_view_id_));
   }
 
   GURL page_url = proxy->page_url_;
   proxy->Send(msg);
 
   // Send may delete proxy.
   proxy = NULL;
 
   if (!result)
     return false;
 
   CreateNPVariant(
-      param_result, channel_copy, np_result, render_view_id, page_url);
+      param_result, channel_copy.get(), np_result, render_view_id, page_url);
   return true;
 }
 
 bool NPObjectProxy::NPNEvaluate(NPP npp,
                                 NPObject *obj,
                                 NPString *script,
                                 NPVariant *result_var) {
   NPObjectProxy* proxy = GetProxy(obj);
   if (!proxy) {
     return false;
@@ skipping 33 matching lines @@
   proxy = NULL;
   if (!result)
     return false;
 
   CreateNPVariant(
       result_param, channel.get(), result_var, render_view_id, page_url);
   return true;
 }
 
 }  // namespace content