File API changes needed for safely passing user selected file entities from the file browser comp...

webkit/fileapi/file_system_util.cc

 // 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.
 
 #include "webkit/fileapi/file_system_util.h"
 
 #include "build/build_config.h"
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/sys_string_conversions.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
 #include "webkit/fileapi/file_system_types.h"
 
 namespace fileapi {
 
-static const char kPersistentDir[] = "/persistent/";
-static const char kTemporaryDir[] = "/temporary/";
-static const char kLocalDir[] = "/local/";
+const char kPersistentDir[] = "/persistent/";
+const char kTemporaryDir[] = "/temporary/";
+const char kExternalDir[] = "/external/";
+
+const char kPersistentName[] = "Persistent";
+const char kTemporaryName[] = "Temporary";
+const char kExternalName[] = "External";
 
 bool CrackFileSystemURL(const GURL& url, GURL* origin_url, FileSystemType* type,
                         FilePath* file_path) {
   GURL origin;
   FileSystemType file_system_type;
 
   if (url.scheme() != "filesystem")
     return false;
 
   std::string temp = url.path();
@@ skipping 39 matching lines @@
     return false;
 
   std::string path = UnescapeURLComponent(bare_url.path(),
       UnescapeRule::SPACES | UnescapeRule::URL_SPECIAL_CHARS);
   if (path.compare(0, strlen(kPersistentDir), kPersistentDir) == 0) {
     file_system_type = kFileSystemTypePersistent;
     path = path.substr(strlen(kPersistentDir));
   } else if (path.compare(0, strlen(kTemporaryDir), kTemporaryDir) == 0) {
     file_system_type = kFileSystemTypeTemporary;
     path = path.substr(strlen(kTemporaryDir));
-  } else if (path.compare(0, strlen(kLocalDir), kLocalDir) == 0) {
-    file_system_type = kFileSystemTypeLocal;
-    path = path.substr(strlen(kLocalDir));
+  } else if (path.compare(0, strlen(kExternalDir), kExternalDir) == 0) {
+    file_system_type = kFileSystemTypeExternal;
+    path = path.substr(strlen(kExternalDir));
   } else {
     return false;
   }
 
   // Ensure the path is relative.
   while (!path.empty() && path[0] == '/')
     path.erase(0, 1);
 
   if (origin_url)
     *origin_url = origin;
@@ skipping 14 matching lines @@
     const GURL& origin_url, fileapi::FileSystemType type) {
   std::string path("filesystem:");
   path += origin_url.spec();
   switch (type) {
   case kFileSystemTypeTemporary:
     path += (kTemporaryDir + 1);  // We don't want the leading slash.
     break;
   case kFileSystemTypePersistent:
     path += (kPersistentDir + 1);  // We don't want the leading slash.
     break;
-  case kFileSystemTypeLocal:
-    path += (kLocalDir + 1);  // We don't want the leading slash.
+  case kFileSystemTypeExternal:
+    path += (kExternalDir + 1);  // We don't want the leading slash.
     break;
   default:
     NOTREACHED();
     return GURL();
   }
   return GURL(path);
 }
 
 }  // namespace fileapi