Use chromium logic for database identifier<->origin conversions

webkit/common/database/database_identifier.cc

 // Copyright 2013 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/database/database_identifier.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "googleurl/src/url_canon.h"
 
 namespace webkit_database {
 
+// static
+std::string GetIdentifierFromOrigin(const GURL& origin) {
+  return DatabaseIdentifier::CreateFromOrigin(origin).ToString();
+}
+
+// static
+GURL GetOriginFromIdentifier(const std::string& identifier) {
+  return DatabaseIdentifier::Parse(identifier).ToOrigin();
+}
+
 static bool SchemeIsUnique(const std::string& scheme) {
   return scheme == "about" || scheme == "data" || scheme == "javascript";
 }
 
 // static
 const DatabaseIdentifier DatabaseIdentifier::UniqueFileIdentifier() {
   return DatabaseIdentifier("", "", 0, true, true);
 }
 
 // static
@@ skipping 86 matching lines @@
 
 std::string DatabaseIdentifier::ToString() const {
   if (is_file_)
     return "file__0";
   if (is_unique_)
     return "__0";
   return scheme_ + "_" + hostname_ + "_" + base::IntToString(port_);
 }
 
 GURL DatabaseIdentifier::ToOrigin() const {
+  if (is_file_)
+    return GURL("file:///");
   if (is_unique_)
     return GURL();
   if (port_ == 0)
     return GURL(scheme_ + "://" + hostname_);
   return GURL(scheme_ + "://" + hostname_ + ":" + base::IntToString(port_));
 }
 
 }  // namespace webkit_database