Use chromium logic for database identifier<->origin conversions

webkit/common/fileapi/file_system_util.cc

 // Copyright (c) 2012 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/common/fileapi/file_system_util.h"
 
 #include <algorithm>
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #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 {
 
 const char kPersistentDir[] = "/persistent";
 const char kTemporaryDir[] = "/temporary";
 const char kIsolatedDir[] = "/isolated";
 const char kExternalDir[] = "/external";
 const char kTestDir[] = "/test";
 
 const base::FilePath::CharType VirtualPath::kRoot[] = FILE_PATH_LITERAL("/");
@@ skipping 136 matching lines @@
   // Internal types are always pointed via isolated or external URLs.
   default:
     NOTREACHED();
   }
   NOTREACHED();
   return GURL();
 }
 
 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;
 }
 
 FileSystemType QuotaStorageTypeToFileSystemType(
     quota::StorageType storage_type) {
   switch (storage_type) {
     case quota::kStorageTypeTemporary:
       return kFileSystemTypeTemporary;
@@ skipping 197 matching lines @@
   std::string root = GetFileSystemRootURI(origin_url,
                                           kFileSystemTypeExternal).spec();
   if (base::FilePath::FromUTF8Unsafe(mount_name).ReferencesParent())
     return std::string();
   root.append(mount_name);
   root.append("/");
   return root;
 }
 
 }  // namespace fileapi