Convert scoped_ptr_malloc -> scoped_ptr, part 1.

base/memory/aligned_memory.h

 // 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.
 
 // AlignedMemory is a POD type that gives you a portable way to specify static
 // or local stack data of a given alignment and size. For example, if you need
 // static storage for a class, but you want manual control over when the object
 // is constructed and destructed (you don't want static initialization and
 // destruction), use AlignedMemory:
 //
 //   static AlignedMemory<sizeof(MyClass), ALIGNOF(MyClass)> my_class;
 //
 //   // ... at runtime:
 //   new(my_class.void_data()) MyClass();
 //
 //   // ... use it:
 //   MyClass* mc = my_class.data_as<MyClass>();
 //
 //   // ... later, to destruct my_class:
 //   my_class.data_as<MyClass>()->MyClass::~MyClass();
 //
 // Alternatively, a runtime sized aligned allocation can be created:
 //
 //   float* my_array = static_cast<float*>(AlignedAlloc(size, alignment));
 //
 //   // ... later, to release the memory:
 //   AlignedFree(my_array);
 //
-// Or using scoped_ptr_malloc:
+// Or using scoped_ptr:
 //
-//   scoped_ptr_malloc<float, ScopedPtrAlignedFree> my_array(
+//   scoped_ptr<float, AlignedFreeDeleter> my_array(
 //       static_cast<float*>(AlignedAlloc(size, alignment)));
 
 #ifndef BASE_MEMORY_ALIGNED_MEMORY_H_
 #define BASE_MEMORY_ALIGNED_MEMORY_H_
 
 #include "base/base_export.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 
 #if defined(COMPILER_MSVC)
@@ skipping 63 matching lines @@
 //   scoped_ptr<Foo, base::AlignedFreeDeleter> foo;
 struct AlignedFreeDeleter {
   inline void operator()(void* ptr) const {
     AlignedFree(ptr);
   }
 };
 
 }  // namespace base
 
 #endif  // BASE_MEMORY_ALIGNED_MEMORY_H_