Don't use a scoped_refptr for StringVar::FromPPVar

webkit/plugins/ppapi/npapi_glue.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 "webkit/plugins/ppapi/npapi_glue.h"
 
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/string_util.h"
 #include "webkit/plugins/ppapi/npobject_var.h"
@@ skipping 32 matching lines @@
     case PP_VARTYPE_BOOL:
       BOOLEAN_TO_NPVARIANT(var.value.as_bool, *result);
       break;
     case PP_VARTYPE_INT32:
       INT32_TO_NPVARIANT(var.value.as_int, *result);
       break;
     case PP_VARTYPE_DOUBLE:
       DOUBLE_TO_NPVARIANT(var.value.as_double, *result);
       break;
     case PP_VARTYPE_STRING: {
-      scoped_refptr<StringVar> string(StringVar::FromPPVar(var));
+      StringVar* string = StringVar::FromPPVar(var);
       if (!string) {
         VOID_TO_NPVARIANT(*result);
         return false;
       }
       const std::string& value = string->value();
       char* c_string = static_cast<char*>(malloc(value.size()));
       memcpy(c_string, value.data(), value.size());
       STRINGN_TO_NPVARIANT(c_string, value.size(), *result);
       break;
     }
@@ skipping 35 matching lines @@
     case NPVariantType_Object:
       return NPObjectToPPVar(instance, NPVARIANT_TO_OBJECT(*variant));
   }
   NOTREACHED();
   return PP_MakeUndefined();
 }
 
 NPIdentifier PPVarToNPIdentifier(PP_Var var) {
   switch (var.type) {
     case PP_VARTYPE_STRING: {
-      scoped_refptr<StringVar> string(StringVar::FromPPVar(var));
+      StringVar* string = StringVar::FromPPVar(var);
       if (!string)
         return NULL;
       return WebBindings::getStringIdentifier(string->value().c_str());
     }
     case PP_VARTYPE_INT32:
       return WebBindings::getIntIdentifier(var.value.as_int);
     default:
       return NULL;
   }
 }
@@ skipping 89 matching lines @@
 }
 
 // Call this to ignore any exception. This prevents the DCHECK from failing
 // in the destructor.
 void PPResultAndExceptionToNPResult::IgnoreException() {
   checked_exception_ = true;
 }
 
 // Throws the current exception to JS. The exception must be set.
 void PPResultAndExceptionToNPResult::ThrowException() {
-  scoped_refptr<StringVar> string(StringVar::FromPPVar(exception_));
-  if (string) {
+  StringVar* string = StringVar::FromPPVar(exception_);
+  if (string)
     WebBindings::setException(object_var_, string->value().c_str());
-  }
 }
 
 // PPVarArrayFromNPVariantArray ------------------------------------------------
 
 PPVarArrayFromNPVariantArray::PPVarArrayFromNPVariantArray(
     PluginInstance* instance,
     size_t size,
     const NPVariant* variants)
     : size_(size) {
   if (size_ > 0) {
@@ skipping 78 matching lines @@
   }
 }
 
 // static
 void TryCatch::Catch(void* self, const char* message) {
   static_cast<TryCatch*>(self)->SetException(message);
 }
 
 }  // namespace ppapi
 }  // namespace webkit