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

content/common_child/npobject_stub.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_stub.h"
 
 #include "content/common_child/np_channel_base.h"
 #include "content/common_child/npobject_util.h"
 #include "content/common_child/plugin_messages.h"
 #include "content/public/common/content_client.h"
@@ skipping 130 matching lines @@
   bool return_value = false;
   NPVariant_Param result_param;
   NPVariant result_var;
 
   VOID_TO_NPVARIANT(result_var);
   result_param.type = NPVARIANT_PARAM_VOID;
 
   int arg_count = static_cast<int>(args.size());
   NPVariant* args_var = new NPVariant[arg_count];
   for (int i = 0; i < arg_count; ++i) {
-    if (!CreateNPVariant(
-            args[i], channel_, &(args_var[i]), render_view_id_, page_url_)) {
-      NPObjectMsg_Invoke::WriteReplyParams(reply_msg, result_param,
-                                           return_value);
+    if (!CreateNPVariant(args[i],
+                         channel_.get(),
+                         &(args_var[i]),
+                         render_view_id_,
+                         page_url_)) {
+      NPObjectMsg_Invoke::WriteReplyParams(
+          reply_msg, result_param, return_value);
       channel_->Send(reply_msg);
       delete[] args_var;
       return;
     }
   }
 
   if (is_default) {
     if (IsPluginProcess()) {
       if (npobject_->_class->invokeDefault) {
         return_value = npobject_->_class->invokeDefault(
@@ skipping 18 matching lines @@
       return_value = WebBindings::invoke(
           0, npobject_, id, args_var, arg_count, &result_var);
     }
   }
 
   for (int i = 0; i < arg_count; ++i)
     WebBindings::releaseVariantValue(&(args_var[i]));
 
   delete[] args_var;
 
-  CreateNPVariantParam(
-      result_var, channel_, &result_param, true, render_view_id_, page_url_);
+  CreateNPVariantParam(result_var,
+                       channel_.get(),
+                       &result_param,
+                       true,
+                       render_view_id_,
+                       page_url_);
   NPObjectMsg_Invoke::WriteReplyParams(reply_msg, result_param, return_value);
   channel_->Send(reply_msg);
 }
 
 void NPObjectStub::OnHasProperty(const NPIdentifier_Param& name,
                                  bool* result) {
   NPIdentifier id = CreateNPIdentifier(name);
   if (IsPluginProcess()) {
     if (npobject_->_class->hasProperty) {
       *result = npobject_->_class->hasProperty(npobject_, id);
@@ skipping 16 matching lines @@
     if (npobject_->_class->getProperty) {
       *result = npobject_->_class->getProperty(npobject_, id, &result_var);
     } else {
       *result = false;
     }
   } else {
     *result = WebBindings::getProperty(0, npobject_, id, &result_var);
   }
 
   CreateNPVariantParam(
-      result_var, channel_, property, true, render_view_id_, page_url_);
+      result_var, channel_.get(), property, true, render_view_id_, page_url_);
 }
 
 void NPObjectStub::OnSetProperty(const NPIdentifier_Param& name,
                                  const NPVariant_Param& property,
                                  IPC::Message* reply_msg) {
   bool result = false;
   NPIdentifier id = CreateNPIdentifier(name);
   NPVariant property_var;
-  if (!CreateNPVariant(
-          property, channel_, &property_var, render_view_id_, page_url_)) {
+  if (!CreateNPVariant(property,
+                       channel_.get(),
+                       &property_var,
+                       render_view_id_,
+                       page_url_)) {
     NPObjectMsg_SetProperty::WriteReplyParams(reply_msg, result);
     channel_->Send(reply_msg);
     return;
   }
 
   if (IsPluginProcess()) {
     if (npobject_->_class->setProperty) {
 #if defined(OS_WIN)
       static base::FilePath plugin_path =
           CommandLine::ForCurrentProcess()->GetSwitchValuePath(
@@ skipping 84 matching lines @@
                                IPC::Message* reply_msg) {
   bool return_value = false;
   NPVariant_Param result_param;
   NPVariant result_var;
 
   VOID_TO_NPVARIANT(result_var);
 
   int arg_count = static_cast<int>(args.size());
   NPVariant* args_var = new NPVariant[arg_count];
   for (int i = 0; i < arg_count; ++i) {
-    if (!CreateNPVariant(
-           args[i], channel_, &(args_var[i]), render_view_id_, page_url_)) {
-      NPObjectMsg_Invoke::WriteReplyParams(reply_msg, result_param,
-                                           return_value);
+    if (!CreateNPVariant(args[i],
+                         channel_.get(),
+                         &(args_var[i]),
+                         render_view_id_,
+                         page_url_)) {
+      NPObjectMsg_Invoke::WriteReplyParams(
+          reply_msg, result_param, return_value);
       channel_->Send(reply_msg);
       delete[] args_var;
       return;
     }
   }
 
   if (IsPluginProcess()) {
     if (npobject_->_class->structVersion >= NP_CLASS_STRUCT_VERSION_CTOR &&
         npobject_->_class->construct) {
       return_value = npobject_->_class->construct(
           npobject_, args_var, arg_count, &result_var);
     } else {
       return_value = false;
     }
   } else {
     return_value = WebBindings::construct(
         0, npobject_, args_var, arg_count, &result_var);
   }
 
   for (int i = 0; i < arg_count; ++i)
     WebBindings::releaseVariantValue(&(args_var[i]));
 
   delete[] args_var;
 
-  CreateNPVariantParam(
-      result_var, channel_, &result_param, true, render_view_id_, page_url_);
+  CreateNPVariantParam(result_var,
+                       channel_.get(),
+                       &result_param,
+                       true,
+                       render_view_id_,
+                       page_url_);
   NPObjectMsg_Invoke::WriteReplyParams(reply_msg, result_param, return_value);
   channel_->Send(reply_msg);
 }
 
 void NPObjectStub::OnEvaluate(const std::string& script,
                               bool popups_allowed,
                               IPC::Message* reply_msg) {
   if (IsPluginProcess()) {
     NOTREACHED() << "Should only be called on NPObjects in the renderer";
     return;
   }
 
   NPVariant result_var;
   NPString script_string;
   script_string.UTF8Characters = script.c_str();
   script_string.UTF8Length = static_cast<unsigned int>(script.length());
 
   bool return_value = WebBindings::evaluateHelper(0, popups_allowed, npobject_,
                                                   &script_string, &result_var);
 
   NPVariant_Param result_param;
-  CreateNPVariantParam(
-      result_var, channel_, &result_param, true, render_view_id_, page_url_);
+  CreateNPVariantParam(result_var,
+                       channel_.get(),
+                       &result_param,
+                       true,
+                       render_view_id_,
+                       page_url_);
   NPObjectMsg_Evaluate::WriteReplyParams(reply_msg, result_param, return_value);
   channel_->Send(reply_msg);
 }
 
 }  // namespace content