Convert scoped_ptr_malloc -> scoped_ptr, part 2.

content/renderer/pepper/host_var_tracker_unittest.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 "base/memory/scoped_ptr.h"
 #include "content/renderer/pepper/host_globals.h"
 #include "content/renderer/pepper/host_var_tracker.h"
 #include "content/renderer/pepper/mock_resource.h"
 #include "content/renderer/pepper/npapi_glue.h"
 #include "content/renderer/pepper/npobject_var.h"
@@ skipping 38 matching lines @@
 // in a NPObjectReleaser to free this ref when the test completes.
 NPObject* NewTrackedNPObject() {
   NPObject* object = new NPObject;
   object->_class = &g_tracked_npclass;
   object->referenceCount = 1;
 
   g_npobjects_alive++;
   return object;
 }
 
-class ReleaseNPObject {
- public:
+struct ReleaseNPObject {
   void operator()(NPObject* o) const {
     blink::WebBindings::releaseObject(o);
   }
 };
 
 // Handles automatically releasing a reference to the NPObject on destruction.
 // It's assumed the input has a ref already taken.
-typedef scoped_ptr_malloc<NPObject, ReleaseNPObject> NPObjectReleaser;
+typedef scoped_ptr<NPObject, ReleaseNPObject> NPObjectReleaser;
 
 }  // namespace
 
 class HostVarTrackerTest : public PpapiUnittest {
  public:
   HostVarTrackerTest() {
   }
 
   HostVarTracker& tracker() {
     return *HostGlobals::Get()->host_var_tracker();
@@ skipping 46 matching lines @@
   var_tracker->ReleaseVar(static_cast<int32_t>(pp_object1.value.as_id));
 
   // Releasing the resource should free the internal ref, and so making a new
   // one now should generate a new ID.
   PP_Var pp_object3 = NPObjectToPPVarForTest(instance(), npobject.get());
   EXPECT_NE(pp_object1.value.as_id, pp_object3.value.as_id);
   var_tracker->ReleaseVar(static_cast<int32_t>(pp_object3.value.as_id));
 }
 
 }  // namespace content