We need this work-around for file:/// URIs as

webkit/database/database_util_unittest.cc

Index: webkit/database/database_util_unittest.cc
===================================================================
--- webkit/database/database_util_unittest.cc	(revision 86470)
+++ webkit/database/database_util_unittest.cc	(working copy)
@@ -26,6 +26,11 @@
   EXPECT_EQ(ASCIIToUTF16(expected_sqlite_suffix), sqlite_suffix);
 }
 
+static GURL ToAndFromOriginIdentifier(const GURL origin_url) {
+  string16 id = DatabaseUtil::GetOriginIdentifier(origin_url);
+  return DatabaseUtil::GetOriginFromIdentifier(id);
+}
+
 namespace webkit_database {
 
 // Test DatabaseUtil::CrackVfsFilePath on various inputs.
@@ -42,4 +47,11 @@
   TestVfsFilePath(false, "/db_name#suffix");
 }
 
+TEST(DatabaseUtilTest, OriginIdentifiers) {
+  const GURL kFileOrigin(GURL("file:///").GetOrigin());
+  const GURL kHttpOrigin(GURL("http://bar/").GetOrigin());
+  EXPECT_EQ(kFileOrigin, ToAndFromOriginIdentifier(kFileOrigin));
+  EXPECT_EQ(kHttpOrigin, ToAndFromOriginIdentifier(kHttpOrigin));
+}
+
 }  // namespace webkit_database