Use chromium logic for database identifier<->origin conversions

webkit/common/database/database_identifier_unittest.cc

Index: webkit/common/database/database_identifier_unittest.cc
diff --git a/webkit/common/database/database_identifier_unittest.cc b/webkit/common/database/database_identifier_unittest.cc
index 141f7a6b744b5a63712021ff0c2d570723f50262..e0cd675e590c808d0143473316f68706a63127a4 100644
--- a/webkit/common/database/database_identifier_unittest.cc
+++ b/webkit/common/database/database_identifier_unittest.cc
@@ -188,7 +188,7 @@ TEST(DatabaseIdentifierTest, ExtractOriginDataFromIdentifier) {
      "http", "nondefaultport.net", 8001,
      GURL("http://nondefaultport.net:8001"), false},
     {"file__0",
-     "", "", 0, GURL(), true},
+     "", "", 0, GURL("file:///"), true},
     {"__0",
      "", "", 0, GURL(), true},
     {"http_foo_bar_baz.org_0",
@@ -226,6 +226,7 @@ TEST(DatabaseIdentifierTest, ExtractOriginDataFromIdentifier) {
     "HtTp_NonCanonicalRepresenTation_0",
     "http_non_ascii.\xa1.com_0",
     "http_not_canonical_escape%3d_0",
+    "http_bytes_after_port_0abcd",
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(bogus_components); ++i) {