diff options
Diffstat (limited to 'webkit/database/database_util.cc')
| -rw-r--r-- | webkit/database/database_util.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/webkit/database/database_util.cc b/webkit/database/database_util.cc index d86a8c2..184e495 100644 --- a/webkit/database/database_util.cc +++ b/webkit/database/database_util.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// 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. @@ -77,7 +77,11 @@ string16 DatabaseUtil::GetOriginIdentifier(const GURL& url) { GURL DatabaseUtil::GetOriginFromIdentifier(const string16& origin_identifier) { GURL origin(WebKit::WebSecurityOrigin::createFromDatabaseIdentifier( origin_identifier).toString()); - DCHECK(origin == origin.GetOrigin()); + // 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; } |