Cleanup: Add fileapi::GetIsolatedFileSystemRootURIString

to hide the details how we create a root URI string for IsolatedFileSystems
from each extension code.

BUG=none
TEST=existing tests

Review URL: https://codereview.chromium.org/11833002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176036 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 24 insertions, 0 deletions

diff --git a/webkit/fileapi/file_system_util.cc b/webkit/fileapi/file_system_util.cc
index 43033b6..aebdd60 100644
--- a/webkit/fileapi/file_system_util.cc
+++ b/webkit/fileapi/file_system_util.cc
@@ -273,4 +273,20 @@ bool CrackIsolatedFileSystemName(const std::string& filesystem_name,
   return true;
 }
 
+std::string GetIsolatedFileSystemRootURIString(
+    const GURL& origin_url,
+    const std::string& filesystem_id,
+    const std::string& optional_root_name) {
+  std::string root = GetFileSystemRootURI(origin_url,
+                                          kFileSystemTypeIsolated).spec();
+  root.append(filesystem_id);
+  root.append("/");
+  if (!optional_root_name.empty()) {
+    DCHECK(!FilePath::FromUTF8Unsafe(optional_root_name).ReferencesParent());
+    root.append(optional_root_name);
+    root.append("/");
+  }
+  return root;
+}
+
 }  // namespace fileapi
diff --git a/webkit/fileapi/file_system_util.h b/webkit/fileapi/file_system_util.h
index 74091c4..b8bc41f 100644
--- a/webkit/fileapi/file_system_util.h
+++ b/webkit/fileapi/file_system_util.h
@@ -123,6 +123,14 @@ WEBKIT_STORAGE_EXPORT bool CrackIsolatedFileSystemName(
     const std::string& filesystem_name,
     std::string* filesystem_id);
 
+// Returns the root URI for an isolated filesystem for origin |origin_url|
+// and |filesystem_id|. If the |optional_root_name| is given the resulting
+// root URI will point to the subfolder within the isolated filesystem.
+WEBKIT_STORAGE_EXPORT std::string GetIsolatedFileSystemRootURIString(
+    const GURL& origin_url,
+    const std::string& filesystem_id,
+    const std::string& optional_root_name);
+
 }  // namespace fileapi
 
 #endif  // WEBKIT_FILEAPI_FILE_SYSTEM_UTIL_H_