Merge 168692 - Apply missing kParentDirectory check

content/browser/child_process_security_policy_impl.cc

Index: content/browser/child_process_security_policy_impl.cc
===================================================================
--- content/browser/child_process_security_policy_impl.cc	(revision 169793)
+++ content/browser/child_process_security_policy_impl.cc	(working copy)
@@ -145,9 +145,18 @@
   bool HasPermissionsForFile(const FilePath& file, int permissions) {
     FilePath current_path = file.StripTrailingSeparators();
     FilePath last_path;
+    int skip = 0;
     while (current_path != last_path) {
-      if (file_permissions_.find(current_path) != file_permissions_.end())
-        return (file_permissions_[current_path] & permissions) == permissions;
+      FilePath base_name =  current_path.BaseName();
+      if (base_name.value() == FilePath::kParentDirectory) {
+        ++skip;
+      } else if (skip > 0) {
+        if (base_name.value() != FilePath::kCurrentDirectory)
+          --skip;
+      } else {
+        if (file_permissions_.find(current_path) != file_permissions_.end())
+          return (file_permissions_[current_path] & permissions) == permissions;
+      }
       last_path = current_path;
       current_path = current_path.DirName();
     }