Grant Files.app access for mount points added after its launch.

chrome/browser/chromeos/fileapi/file_access_permissions.cc

Index: chrome/browser/chromeos/fileapi/file_access_permissions.cc
diff --git a/chrome/browser/chromeos/fileapi/file_access_permissions.cc b/chrome/browser/chromeos/fileapi/file_access_permissions.cc
index dba65b340ee44e662b886b795e0347ea36961644..266156a8d231a1394ab4f7b7b854f0e4a6f0e752 100644
--- a/chrome/browser/chromeos/fileapi/file_access_permissions.cc
+++ b/chrome/browser/chromeos/fileapi/file_access_permissions.cc
@@ -4,29 +4,31 @@
 
 #include "chrome/browser/chromeos/fileapi/file_access_permissions.h"
 
-#include "base/command_line.h"
 #include "base/logging.h"
 
 namespace chromeos {
 
+namespace {
+
+// Empty path is prefix of any other paths, hence it represents full permission.
+base::FilePath FullPermission() { return base::FilePath(); }
+
+}  // namespace
+
 FileAccessPermissions::FileAccessPermissions() {}
 
 FileAccessPermissions::~FileAccessPermissions() {}
 
+void FileAccessPermissions::GrantFullAccessPermission(
+    const std::string& extension_id) {
+  base::AutoLock locker(lock_);
+  path_map_[extension_id].insert(FullPermission());
+}
 
 void FileAccessPermissions::GrantAccessPermission(
     const std::string& extension_id, const base::FilePath& path) {

[hashimoto, 2014/01/28 10:55:13]

nit: How about having "if" or DCHECK to verify path is not empty?

[kinaba, 2014/01/28 23:59:49]

Done.

   base::AutoLock locker(lock_);
-  PathAccessMap::iterator path_map_iter = path_map_.find(extension_id);
-  if (path_map_iter == path_map_.end()) {
-    PathSet path_set;
-    path_set.insert(path);
-    path_map_.insert(PathAccessMap::value_type(extension_id, path_set));
-  } else {
-    if (path_map_iter->second.find(path) != path_map_iter->second.end())
-      return;
-    path_map_iter->second.insert(path);
-  }
+  path_map_[extension_id].insert(path);
 }
 
 bool FileAccessPermissions::HasAccessPermission(
@@ -35,13 +37,17 @@ bool FileAccessPermissions::HasAccessPermission(
   PathAccessMap::const_iterator path_map_iter = path_map_.find(extension_id);
   if (path_map_iter == path_map_.end())
     return false;
+  const PathSet& path_set = path_map_iter->second;
+
+  if (path_set.find(FullPermission()) != path_set.end())
+    return true;
 
   // Check this file and walk up its directory tree to find if this extension
   // has access to it.
   base::FilePath current_path = path.StripTrailingSeparators();
   base::FilePath last_path;
   while (current_path != last_path) {
-    if (path_map_iter->second.find(current_path) != path_map_iter->second.end())
+    if (path_set.find(current_path) != path_set.end())
       return true;
     last_path = current_path;
     current_path = current_path.DirName();