| Index: content/browser/service_worker/service_worker_database.cc
|
| diff --git a/content/browser/service_worker/service_worker_database.cc b/content/browser/service_worker/service_worker_database.cc
|
| index 2db301c1b627bb2ed9fec1f69b4852c9573194dd..a5ebca28b5682e753a61b575e3b62af71f4cad73 100644
|
| --- a/content/browser/service_worker/service_worker_database.cc
|
| +++ b/content/browser/service_worker/service_worker_database.cc
|
| @@ -801,7 +801,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::DeleteRegistration(
|
|
|
| leveldb::WriteBatch batch;
|
|
|
| - // Remove |origin| from unique origins if a registration specified by
|
| + // Remove |origin| from opaque origins if a registration specified by
|
| // |registration_id| is the only one for |origin|.
|
| // TODO(nhiroki): Check the uniqueness by more efficient way.
|
| std::vector<RegistrationData> registrations;
|
| @@ -1045,7 +1045,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::DeleteAllDataForOrigins(
|
| if (!origin.is_valid())
|
| return STATUS_ERROR_FAILED;
|
|
|
| - // Delete from the unique origin list.
|
| + // Delete from the opaque origin list.
|
| batch.Delete(CreateUniqueOriginKey(origin));
|
|
|
| // Delete from the foreign fetch origin list.
|
| @@ -1266,7 +1266,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::ParseRegistrationData(
|
| }
|
| for (int i = 0; i < data.foreign_fetch_origin_size(); ++i) {
|
| url::Origin parsed_origin(GURL(data.foreign_fetch_origin(i)));
|
| - if (parsed_origin.unique()) {
|
| + if (parsed_origin.opaque()) {
|
| DLOG(ERROR) << "Foreign fetch origin '" << data.foreign_fetch_origin(i)
|
| << "' is not valid.";
|
| return ServiceWorkerDatabase::STATUS_ERROR_CORRUPTED;
|
|
|