Convert scoped_ptr_malloc -> scoped_ptr, part 1.

base/task_runner_util_unittest.cc

Index: base/task_runner_util_unittest.cc
diff --git a/base/task_runner_util_unittest.cc b/base/task_runner_util_unittest.cc
index 04743944d63dc8039ae92b9707537a69edf68970..481f09ebd197c0d40d541d3bb7054d1a1abce7f5 100644
--- a/base/task_runner_util_unittest.cc
+++ b/base/task_runner_util_unittest.cc
@@ -45,20 +45,20 @@ void ExpectFoo(scoped_ptr<Foo> foo) {
   EXPECT_FALSE(foo.get());
 }
 
-struct FreeFooFunctor {
+struct FooDeleter {
   void operator()(Foo* foo) const {
     ++g_foo_free_count;
     delete foo;
   };
 };
 
-scoped_ptr_malloc<Foo, FreeFooFunctor> CreateScopedFoo() {
-  return scoped_ptr_malloc<Foo, FreeFooFunctor>(new Foo);
+scoped_ptr<Foo, FooDeleter> CreateScopedFoo() {
+  return scoped_ptr<Foo, FooDeleter>(new Foo);
 }
 
-void ExpectScopedFoo(scoped_ptr_malloc<Foo, FreeFooFunctor> foo) {
+void ExpectScopedFoo(scoped_ptr<Foo, FooDeleter> foo) {
   EXPECT_TRUE(foo.get());
-  scoped_ptr_malloc<Foo, FreeFooFunctor> local_foo(foo.Pass());
+  scoped_ptr<Foo, FooDeleter> local_foo(foo.Pass());
   EXPECT_TRUE(local_foo.get());
   EXPECT_FALSE(foo.get());
 }