Index: content/browser/indexed_db/indexed_db_context_impl.cc |
diff --git a/content/browser/indexed_db/indexed_db_context_impl.cc b/content/browser/indexed_db/indexed_db_context_impl.cc |
index 0dce05aa71c568bb41996883a60ea355a3b64608..01ffd17704738173bb45aefbc6d4018613380762 100644 |
--- a/content/browser/indexed_db/indexed_db_context_impl.cc |
+++ b/content/browser/indexed_db/indexed_db_context_impl.cc |
@@ -149,9 +149,9 @@ std::vector<IndexedDBInfo> IndexedDBContextImpl::GetAllOriginsInfo() { |
std::vector<IndexedDBInfo> result; |
for (const auto& origin : origins) { |
size_t connection_count = GetConnectionCount(origin); |
- result.push_back( |
- IndexedDBInfo(GURL(origin.Serialize()), GetOriginDiskUsage(origin), |
- GetOriginLastModified(origin), connection_count)); |
+ result.push_back(IndexedDBInfo(origin.GetURL(), GetOriginDiskUsage(origin), |
+ GetOriginLastModified(origin), |
+ connection_count)); |
} |
return result; |
} |
@@ -439,7 +439,7 @@ void IndexedDBContextImpl::ConnectionOpened(const Origin& origin, |
IndexedDBConnection* connection) { |
DCHECK(TaskRunner()->RunsTasksOnCurrentThread()); |
quota_manager_proxy()->NotifyStorageAccessed( |
- storage::QuotaClient::kIndexedDatabase, GURL(origin.Serialize()), |
+ storage::QuotaClient::kIndexedDatabase, origin.GetURL(), |
storage::kStorageTypeTemporary); |
if (AddToOriginSet(origin)) { |
// A newly created db, notify the quota system. |
@@ -453,7 +453,7 @@ void IndexedDBContextImpl::ConnectionClosed(const Origin& origin, |
IndexedDBConnection* connection) { |
DCHECK(TaskRunner()->RunsTasksOnCurrentThread()); |
quota_manager_proxy()->NotifyStorageAccessed( |
- storage::QuotaClient::kIndexedDatabase, GURL(origin.Serialize()), |
+ storage::QuotaClient::kIndexedDatabase, origin.GetURL(), |
storage::kStorageTypeTemporary); |
if (factory_.get() && factory_->GetConnectionCount(origin) == 0) |
QueryDiskAndUpdateQuotaUsage(origin); |
@@ -499,8 +499,7 @@ IndexedDBContextImpl::~IndexedDBContextImpl() { |
// static |
base::FilePath IndexedDBContextImpl::GetBlobStoreFileName( |
const Origin& origin) { |
- std::string origin_id = |
- storage::GetIdentifierFromOrigin(GURL(origin.Serialize())); |
+ std::string origin_id = storage::GetIdentifierFromOrigin(origin.GetURL()); |
return base::FilePath() |
.AppendASCII(origin_id) |
.AddExtension(kIndexedDBExtension) |
@@ -509,8 +508,7 @@ base::FilePath IndexedDBContextImpl::GetBlobStoreFileName( |
// static |
base::FilePath IndexedDBContextImpl::GetLevelDBFileName(const Origin& origin) { |
- std::string origin_id = |
- storage::GetIdentifierFromOrigin(GURL(origin.Serialize())); |
+ std::string origin_id = storage::GetIdentifierFromOrigin(origin.GetURL()); |
return base::FilePath() |
.AppendASCII(origin_id) |
.AddExtension(kIndexedDBExtension) |
@@ -551,7 +549,7 @@ void IndexedDBContextImpl::QueryDiskAndUpdateQuotaUsage(const Origin& origin) { |
if (difference) { |
origin_size_map_[origin] = current_disk_usage; |
quota_manager_proxy()->NotifyStorageModified( |
- storage::QuotaClient::kIndexedDatabase, GURL(origin.Serialize()), |
+ storage::QuotaClient::kIndexedDatabase, origin.GetURL(), |
storage::kStorageTypeTemporary, difference); |
} |
} |