Mac app mode: locate Chrome + refactor

content/common/sandbox_mac_diraccess_unittest.mm

 // Copyright (c) 2011 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 112 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:
-  inline void operator()(FilePath* x) const {
-    if (x) {
-      file_util::Delete(*x, true);
-    }
-  }
-};
-
-typedef scoped_ptr_malloc<FilePath, ScopedDirectoryDelete> ScopedDirectory;
-
 // Disabled as times out, taking out remaining tests: 89170.
 TEST_F(MacDirAccessSandboxTest, DISABLED_SandboxAccess) {
   using file_util::CreateDirectory;
 
   FilePath tmp_dir;
   ASSERT_TRUE(file_util::CreateNewTempDirectory("", &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 .
   Sandbox::GetCanonicalSandboxPath(&tmp_dir);
-  ScopedDirectory cleanup(&tmp_dir);
+  file_util::ScopedDirectory cleanup(&tmp_dir);
 
   const char* sandbox_dir_cases[] = {
     "simple_dir_name",
     "^hello++ $",       // Regex.
     "\\^.$|()[]*+?{}",  // All regex characters.
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(sandbox_dir_cases); ++i) {
     const char* sandbox_dir_name = sandbox_dir_cases[i];
     FilePath sandbox_dir = tmp_dir.Append(sandbox_dir_name);
     ASSERT_TRUE(CreateDirectory(sandbox_dir));
-    ScopedDirectory cleanup_sandbox(&sandbox_dir);
+    file_util::ScopedDirectory cleanup_sandbox(&sandbox_dir);
 
     // Create a sibling directory of the sandbox dir, whose name has sandbox dir
     // as a substring but to which access is denied.
     std::string sibling_sandbox_dir_name_denied =
         std::string(sandbox_dir_cases[i]) + kDeniedSuffix;
     FilePath sibling_sandbox_dir = tmp_dir.Append(
                                       sibling_sandbox_dir_name_denied.c_str());
     ASSERT_TRUE(CreateDirectory(sibling_sandbox_dir));
-    ScopedDirectory cleanup_sandbox_sibling(&sibling_sandbox_dir);
+    file_util::ScopedDirectory cleanup_sandbox_sibling(&sibling_sandbox_dir);
 
     EXPECT_TRUE(CheckSandbox(sandbox_dir.value()));
   }
 }
 
 MULTIPROCESS_TEST_MAIN(mac_sandbox_path_access) {
   char *sandbox_allowed_dir = getenv(kSandboxAccessPathKey);
   if (!sandbox_allowed_dir)
     return -1;
 
@@ skipping 113 matching lines @@
     PLOG(ERROR) << "Sandbox breach: was able to write ("
                 << denied_file2.value()
                 << ")";
     return -1;
   }
 
   return 0;
 }
 
 }  // namespace sandbox