Use chromium logic for database identifier<->origin conversions

webkit/common/fileapi/file_system_util.cc

Index: webkit/common/fileapi/file_system_util.cc
diff --git a/webkit/common/fileapi/file_system_util.cc b/webkit/common/fileapi/file_system_util.cc
index 0f178449e9d6f1898e704c39325142e13eeebe36..2ce3c99ce2c5c028626a696dd0678fd05b9a2360 100644
--- a/webkit/common/fileapi/file_system_util.cc
+++ b/webkit/common/fileapi/file_system_util.cc
@@ -12,7 +12,7 @@
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "googleurl/src/gurl.h"
-#include "webkit/base/origin_url_conversions.h"
+#include "webkit/common/database/database_identifier.h"
 
 namespace fileapi {
 
@@ -169,7 +169,7 @@ GURL GetFileSystemRootURI(const GURL& origin_url, FileSystemType type) {
 
 std::string GetFileSystemName(const GURL& origin_url, FileSystemType type) {
   std::string origin_identifier =
-      webkit_base::GetOriginIdentifierFromURL(origin_url);
+      webkit_database::GetIdentifierFromOrigin(origin_url);
   std::string type_string = GetFileSystemTypeString(type);
   DCHECK(!type_string.empty());
   return origin_identifier + ":" + type_string;