Fix GetOriginURLFromIdentifier

webkit/fileapi/file_system_util.cc

Index: webkit/fileapi/file_system_util.cc
diff --git a/webkit/fileapi/file_system_util.cc b/webkit/fileapi/file_system_util.cc
index 089e4e288d3f81cfcd298090117287a1528be2ab..5224b3596923ffa6bb31cf88d8ec92449308e1d4 100644
--- a/webkit/fileapi/file_system_util.cc
+++ b/webkit/fileapi/file_system_util.cc
@@ -205,14 +205,16 @@ GURL GetOriginURLFromIdentifier(const std::string& origin_identifier) {
   WebKit::WebSecurityOrigin web_security_origin =
       WebKit::WebSecurityOrigin::createFromDatabaseIdentifier(
           UTF8ToUTF16(origin_identifier));
-  GURL origin_url(web_security_origin.toString());
 
   // We need this work-around for file:/// URIs as
-  // createFromDatabaseIdentifier returns empty origin_url for them.
-  if (origin_url.spec().empty() &&
-      origin_identifier.find("file__") == 0)
-    return GURL("file:///");
-  return origin_url;
+  // createFromDatabaseIdentifier returns null origin_url for them.
+  if (web_security_origin.isUnique()) {
+    if (origin_identifier.find("file__") == 0)
+      return GURL("file:///");
+    return GURL();
+  }
+
+  return GURL(web_security_origin.toString());
 }
 
 std::string GetFileSystemTypeString(FileSystemType type) {