Fix GetOriginURLFromIdentifier

webkit/database/database_util.cc

 // Copyright (c) 2011 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/database/database_util.h"
 
 #include "base/utf_string_conversions.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "webkit/database/database_tracker.h"
@@ skipping 57 matching lines @@
     return FilePath();
   return full_path;
 }
 
 string16 DatabaseUtil::GetOriginIdentifier(const GURL& url) {
   string16 spec = UTF8ToUTF16(url.spec());
   return WebKit::WebSecurityOrigin::createFromString(spec).databaseIdentifier();
 }
 
 GURL DatabaseUtil::GetOriginFromIdentifier(const string16& origin_identifier) {
-  GURL origin(WebKit::WebSecurityOrigin::createFromDatabaseIdentifier(
-      origin_identifier).toString());
+  WebKit::WebSecurityOrigin web_security_origin =
+      WebKit::WebSecurityOrigin::createFromDatabaseIdentifier(
+          origin_identifier);
+
   // We need this work-around for file:/// URIs as
-  // createFromDatabaseIdentifier returns empty origin url for them.
-  if (origin.spec().empty() &&
-      origin_identifier.find(ASCIIToUTF16("file__")) == 0)
-    return GURL("file:///");
-  return origin;
+  // createFromDatabaseIdentifier returns null origin_url for them.
+  if (web_security_origin.isUnique()) {
+    if (origin_identifier.find(UTF8ToUTF16("file__")) == 0)
+      return GURL("file:///");
+    return GURL();
+  }
+
+  return GURL(web_security_origin.toString());
 }
 
 }  // namespace webkit_database