Cleanup FileSystemOperation for preparing for adding FSO-factory method

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"
@@ skipping 78 matching lines @@
 #if defined(OS_WIN)
     *file_path = FilePath(base::SysUTF8ToWide(path)).
         NormalizeWindowsPathSeparators().StripTrailingSeparators();
 #elif defined(OS_POSIX)
     *file_path = FilePath(path).StripTrailingSeparators();
 #endif
 
   return true;
 }
 
-GURL GetFileSystemRootURI(
-    const GURL& origin_url, fileapi::FileSystemType type) {
+GURL GetFileSystemRootURI(const GURL& origin_url, 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 kFileSystemTypeExternal:
     path += (kExternalDir + 1);  // We don't want the leading slash.
     break;
   default:
     NOTREACHED();
     return GURL();
   }
   return GURL(path);
 }
 
+std::string GetFileSystemName(const GURL& origin_url, FileSystemType type) {
+  std::string origin_identifier = GetOriginIdentifierFromURL(origin_url);
+  std::string type_string = GetFileSystemTypeString(type);
+  DCHECK(!type_string.empty());
+  return origin_identifier + ":" + type_string;
+}
+
 FileSystemType QuotaStorageTypeToFileSystemType(
     quota::StorageType storage_type) {
   switch (storage_type) {
     case quota::kStorageTypeTemporary:
       return kFileSystemTypeTemporary;
     case quota::kStorageTypePersistent:
       return kFileSystemTypePersistent;
     default:
       return kFileSystemTypeUnknown;
   }
@@ skipping 40 matching lines @@
       return fileapi::kPersistentName;
     case kFileSystemTypeExternal:
       return fileapi::kExternalName;
     case kFileSystemTypeUnknown:
     default:
       return std::string();
   }
 }
 
 }  // namespace fileapi