Convert scoped_ptr_malloc -> scoped_ptr, part 1.

base/task_runner_util_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/task_runner_util.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 27 matching lines @@
   return scoped_ptr<Foo>(new Foo);
 }
 
 void ExpectFoo(scoped_ptr<Foo> foo) {
   EXPECT_TRUE(foo.get());
   scoped_ptr<Foo> local_foo(foo.Pass());
   EXPECT_TRUE(local_foo.get());
   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());
 }
 
 }  // namespace
 
 TEST(TaskRunnerHelpersTest, PostTaskAndReplyWithResult) {
   int result = 0;
 
   MessageLoop message_loop;
@@ skipping 47 matching lines @@
                              Bind(&CreateScopedFoo),
                              Bind(&ExpectScopedFoo));
 
   RunLoop().RunUntilIdle();
 
   EXPECT_EQ(1, g_foo_destruct_count);
   EXPECT_EQ(1, g_foo_free_count);
 }
 
 }  // namespace base