Index: content/common/sandbox_mac_diraccess_unittest.mm |
diff --git a/content/common/sandbox_mac_diraccess_unittest.mm b/content/common/sandbox_mac_diraccess_unittest.mm |
index 45c730c673513f08c15d1135231d7a5fe1474596..86d3eef249c9f0f5dad8098ff15885ced73bf5fc 100644 |
--- a/content/common/sandbox_mac_diraccess_unittest.mm |
+++ b/content/common/sandbox_mac_diraccess_unittest.mm |
@@ -133,17 +133,14 @@ TEST_F(MacDirAccessSandboxTest, RegexEscape) { |
} |
// 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; |