Test GURL::spec() usage changes with DEPS rolled to the new version.

webkit/database/database_util.cc

Index: webkit/database/database_util.cc
diff --git a/webkit/database/database_util.cc b/webkit/database/database_util.cc
index b5e8df0bfbe4b50cd1e835f66d63c2f1deed39d7..b38d9b59fc5bf25ba2f7a803cea823f04270c972 100644
--- a/webkit/database/database_util.cc
+++ b/webkit/database/database_util.cc
@@ -77,12 +77,14 @@ string16 DatabaseUtil::GetOriginIdentifier(const GURL& url) {
 GURL DatabaseUtil::GetOriginFromIdentifier(const string16& origin_identifier) {
   GURL origin(WebKit::WebSecurityOrigin::createFromDatabaseIdentifier(
       origin_identifier).toString());
-  // 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)
+  if (origin.is_valid())
+    return origin;
+  // Origin identifier for files start with 'file__', not with 'file:', thus
+  // GURL can't parse them correctly.
+  else if (origin_identifier.find(ASCIIToUTF16("file__")) == 0)
     return GURL("file:///");
-  return origin;
+  else
+    return GURL();
 }
 
 }  // namespace webkit_database