Commit 07a0ecf8 authored by Victor Costan's avatar Victor Costan Committed by Commit Bot

IndexedDB: Use url::Origin::host() in IndexedDBQuotaClient.

The original code converts the Origin to GURL, then uses

net::GetHostOrSpecFromURL(). This is likely the result of mechanical
conversions replacing GURLs representing origins with url::Origin.

Change-Id: I1fb5e38987b569c88a69bed41450957a33db3f57
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2249387Reviewed-by: default avatarDaniel Murphy <dmurph@chromium.org>
Commit-Queue: Daniel Murphy <dmurph@chromium.org>
Auto-Submit: Victor Costan <pwnall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#779341}
parent 3ba9120d
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
#include "base/task_runner_util.h" #include "base/task_runner_util.h"
#include "base/threading/sequenced_task_runner_handle.h" #include "base/threading/sequenced_task_runner_handle.h"
#include "content/browser/indexed_db/indexed_db_context_impl.h" #include "content/browser/indexed_db/indexed_db_context_impl.h"
#include "net/base/url_util.h"
#include "storage/browser/database/database_util.h" #include "storage/browser/database/database_util.h"
#include "third_party/blink/public/mojom/quota/quota_types.mojom.h" #include "third_party/blink/public/mojom/quota/quota_types.mojom.h"
#include "url/origin.h"
using blink::mojom::StorageType; using blink::mojom::StorageType;
using storage::DatabaseUtil; using storage::DatabaseUtil;
...@@ -60,8 +60,7 @@ void GetOriginsForHostOnIndexedDBThread( ...@@ -60,8 +60,7 @@ void GetOriginsForHostOnIndexedDBThread(
std::set<url::Origin>* origins_to_return) { std::set<url::Origin>* origins_to_return) {
DCHECK(context->IDBTaskRunner()->RunsTasksInCurrentSequence()); DCHECK(context->IDBTaskRunner()->RunsTasksInCurrentSequence());
for (const auto& origin : context->GetAllOrigins()) { for (const auto& origin : context->GetAllOrigins()) {
GURL origin_url(origin.Serialize()); if (host == origin.host())
if (host == net::GetHostOrSpecFromURL(origin_url))
origins_to_return->insert(origin); origins_to_return->insert(origin);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment