Convert scoped_ptr_malloc -> scoped_ptr, part 1.

content/common/sandbox_mac_diraccess_unittest.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 #include <dirent.h>
 
 extern "C" {
 #include <sandbox.h>
 }
@@ skipping 115 matching lines @@
     expected.append(kSandboxEscapeSuffix);
 
     std::string out;
     EXPECT_TRUE(Sandbox::QuoteStringForRegex(in_utf8, &out));
     EXPECT_EQ(expected, out);
 
   }
 }
 
 // A class to handle auto-deleting a directory.
-class ScopedDirectoryDelete {
- public:
+struct ScopedDirectoryDelete {
   inline void operator()(base::FilePath* x) const {
-    if (x) {
+    if (x)
       base::DeleteFile(*x, true);
-    }
   }
 };
 
-typedef scoped_ptr_malloc<base::FilePath, ScopedDirectoryDelete>
-    ScopedDirectory;
+typedef scoped_ptr<base::FilePath, ScopedDirectoryDelete> ScopedDirectory;
 
 TEST_F(MacDirAccessSandboxTest, SandboxAccess) {
   using base::CreateDirectory;
 
   base::FilePath tmp_dir;
   ASSERT_TRUE(base::CreateNewTempDirectory(base::FilePath::StringType(),
                                            &tmp_dir));
   // This step is important on OS X since the sandbox only understands "real"
   // paths and the paths CreateNewTempDirectory() returns are empirically in
   // /var which is a symlink to /private/var .
@@ skipping 147 matching lines @@
     PLOG(ERROR) << "Sandbox breach: was able to write ("
                 << denied_file2.value()
                 << ")";
     return -1;
   }
 
   return 0;
 }
 
 }  // namespace content