Rename Origin.unique() to opaque().

content/browser/service_worker/service_worker_database.cc

 // Copyright 2014 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.
 
 #include "content/browser/service_worker/service_worker_database.h"
 
 #include <utility>
 
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
@@ skipping 783 matching lines @@
   Status status = LazyOpen(false);
   if (IsNewOrNonexistentDatabase(status))
     return STATUS_OK;
   if (status != STATUS_OK)
     return status;
   if (!origin.is_valid())
     return STATUS_ERROR_FAILED;
 
   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;
   status = GetRegistrationsForOrigin(origin, &registrations, nullptr);
   if (status != STATUS_OK)
     return status;
 
   if (registrations.size() == 1 &&
       registrations[0].registration_id == registration_id) {
     batch.Delete(CreateUniqueOriginKey(origin));
@@ skipping 223 matching lines @@
   if (IsNewOrNonexistentDatabase(status))
     return STATUS_OK;
   if (status != STATUS_OK)
     return status;
   leveldb::WriteBatch batch;
 
   for (const GURL& origin : origins) {
     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.
     batch.Delete(CreateForeignFetchOriginKey(origin));
 
     std::vector<RegistrationData> registrations;
     status = GetRegistrationsForOrigin(origin, &registrations, nullptr);
     if (status != STATUS_OK)
       return status;
 
@@ skipping 200 matching lines @@
         !ServiceWorkerUtils::ScopeMatches(scope_url, sub_scope_url)) {
       DLOG(ERROR) << "Foreign fetch scope '" << data.foreign_fetch_scope(i)
                   << "' is not valid or does not match Scope URL '" << scope_url
                   << "'.";
       return ServiceWorkerDatabase::STATUS_ERROR_CORRUPTED;
     }
     out->foreign_fetch_scopes.push_back(sub_scope_url);
   }
   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;
     }
     out->foreign_fetch_origins.push_back(parsed_origin);
   }
   if (data.has_origin_trial_tokens()) {
     const ServiceWorkerOriginTrialInfo& info = data.origin_trial_tokens();
     TrialTokenValidator::FeatureToTokensMap origin_trial_tokens;
     for (int i = 0; i < info.features_size(); ++i) {
@@ skipping 440 matching lines @@
   if (status != STATUS_OK)
     Disable(from_here, status);
   ServiceWorkerMetrics::CountWriteDatabaseResult(status);
 }
 
 bool ServiceWorkerDatabase::IsDatabaseInMemory() const {
   return path_.empty();
 }
 
 }  // namespace content