Change DeleteOriginDataOnFileTaskRunner to use url::Origin.

This CL update the function DeleteOriginDataOnFileTaskRunner to use
dedicated Origin type instead of GURL.

Bug: 598424
Change-Id: Ieb797f641079f715ac2cd94e6ec3a86aa0c1c6dc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2007322
Commit-Queue: Zhuoyu Qian <zhuoyu.qian@samsung.com>
Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Joshua Bell <jsbell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#744173}

chrome/browser/browsing_data/browsing_data_media_license_helper.cc

@@ -128,7 +128,7 @@ void BrowsingDataMediaLicenseHelperImpl::
   storage::FileSystemQuotaUtil* quota_util = backend->GetQuotaUtil();
   quota_util->DeleteOriginDataOnFileTaskRunner(
       filesystem_context_.get(), filesystem_context_->quota_manager_proxy(),
-      origin, kType);
+      url::Origin::Create(origin), kType);
 }
 
 }  // namespace

content/browser/plugin_private_storage_helper.cc

@@ -367,7 +367,7 @@ void PluginPrivateDataDeletionHelper::DecrementTaskCount(
             storage::kFileSystemTypePluginPrivate);
     storage::FileSystemQuotaUtil* quota_util = backend->GetQuotaUtil();
     base::File::Error result = quota_util->DeleteOriginDataOnFileTaskRunner(
-        filesystem_context_.get(), nullptr, origin,
+        filesystem_context_.get(), nullptr, url::Origin::Create(origin),
         storage::kFileSystemTypePluginPrivate);
     ALLOW_UNUSED_LOCAL(result);
     DLOG_IF(ERROR, result != base::File::FILE_OK)

storage/browser/file_system/file_system_context.cc

@@ -216,8 +216,8 @@ bool FileSystemContext::DeleteDataForOriginOnFileTaskRunner(
     if (!backend->GetQuotaUtil())
       continue;
     if (backend->GetQuotaUtil()->DeleteOriginDataOnFileTaskRunner(
-            this, quota_manager_proxy(), origin_url, type_backend_pair.first) !=
-        base::File::FILE_OK) {
+            this, quota_manager_proxy(), url::Origin::Create(origin_url),
+            type_backend_pair.first) != base::File::FILE_OK) {
       // Continue the loop, but record the failure.
       success = false;
     }
@@ -419,10 +419,10 @@ void FileSystemContext::DeleteFileSystem(const url::Origin& origin,
   base::PostTaskAndReplyWithResult(
       default_file_task_runner(), FROM_HERE,
       // It is safe to pass Unretained(quota_util) since context owns it.
-      base::BindOnce(
-          &FileSystemQuotaUtil::DeleteOriginDataOnFileTaskRunner,
-          base::Unretained(backend->GetQuotaUtil()), base::RetainedRef(this),
-          base::Unretained(quota_manager_proxy()), origin.GetURL(), type),
+      base::BindOnce(&FileSystemQuotaUtil::DeleteOriginDataOnFileTaskRunner,
+                     base::Unretained(backend->GetQuotaUtil()),
+                     base::RetainedRef(this),
+                     base::Unretained(quota_manager_proxy()), origin, type),
       std::move(callback));
 }
 

storage/browser/file_system/file_system_quota_client.cc

@@ -73,7 +73,7 @@ blink::mojom::QuotaStatusCode DeleteOriginOnFileTaskRunner(
     return blink::mojom::QuotaStatusCode::kErrorNotSupported;
   base::File::Error result =
       provider->GetQuotaUtil()->DeleteOriginDataOnFileTaskRunner(
-          context, context->quota_manager_proxy(), origin.GetURL(), type);
+          context, context->quota_manager_proxy(), origin, type);
   if (result == base::File::FILE_OK)
     return blink::mojom::QuotaStatusCode::kOk;
   return blink::mojom::QuotaStatusCode::kErrorInvalidModification;

storage/browser/file_system/file_system_quota_util.h

@@ -39,7 +39,7 @@ class COMPONENT_EXPORT(STORAGE_BROWSER) FileSystemQuotaUtil {
   virtual base::File::Error DeleteOriginDataOnFileTaskRunner(
       FileSystemContext* context,
       QuotaManagerProxy* proxy,
-      const GURL& origin_url,
+      const url::Origin& origin,
       FileSystemType type) = 0;
 
   virtual void PerformStorageCleanupOnFileTaskRunner(FileSystemContext* context,

storage/browser/file_system/plugin_private_file_system_backend.cc

@@ -231,12 +231,12 @@ base::File::Error
 PluginPrivateFileSystemBackend::DeleteOriginDataOnFileTaskRunner(
     FileSystemContext* context,
     QuotaManagerProxy* proxy,
-    const GURL& origin_url,
+    const url::Origin& origin,
     FileSystemType type) {
   if (!CanHandleType(type))
     return base::File::FILE_ERROR_SECURITY;
   bool result = obfuscated_file_util()->DeleteDirectoryForOriginAndType(
-      url::Origin::Create(origin_url), std::string());
+      origin, std::string());
   if (result)
     return base::File::FILE_OK;
   return base::File::FILE_ERROR_FAILED;

storage/browser/file_system/plugin_private_file_system_backend.h

@@ -105,7 +105,7 @@ class COMPONENT_EXPORT(STORAGE_BROWSER) PluginPrivateFileSystemBackend
   base::File::Error DeleteOriginDataOnFileTaskRunner(
       FileSystemContext* context,
       QuotaManagerProxy* proxy,
-      const GURL& origin_url,
+      const url::Origin& origin,
       FileSystemType type) override;
   void PerformStorageCleanupOnFileTaskRunner(FileSystemContext* context,
                                              QuotaManagerProxy* proxy,

storage/browser/file_system/plugin_private_file_system_backend_unittest.cc

@@ -220,7 +220,7 @@ TEST_F(PluginPrivateFileSystemBackendTest, DeleteOriginDirectory) {
 
   // Delete data for kOrigin1.
   error = backend()->DeleteOriginDataOnFileTaskRunner(context_.get(), nullptr,
-                                                      kOrigin1.GetURL(), kType);
+                                                      kOrigin1, kType);
   EXPECT_EQ(base::File::FILE_OK, error);
 
   // Confirm 'foo' in kOrigin1 is deleted.

storage/browser/file_system/sandbox_file_system_backend_delegate.cc

@@ -342,18 +342,18 @@ base::File::Error
 SandboxFileSystemBackendDelegate::DeleteOriginDataOnFileTaskRunner(
     FileSystemContext* file_system_context,
     QuotaManagerProxy* proxy,
-    const GURL& origin_url,
+    const url::Origin& origin,
     FileSystemType type) {
   DCHECK(file_task_runner_->RunsTasksInCurrentSequence());
-  int64_t usage = GetOriginUsageOnFileTaskRunner(
-      file_system_context, url::Origin::Create(origin_url), type);
+  int64_t usage =
+      GetOriginUsageOnFileTaskRunner(file_system_context, origin, type);
   usage_cache()->CloseCacheFiles();
   bool result = obfuscated_file_util()->DeleteDirectoryForOriginAndType(
-      url::Origin::Create(origin_url), GetTypeString(type));
+      origin, GetTypeString(type));
   if (result && proxy && usage) {
-    proxy->NotifyStorageModified(
-        QuotaClient::kFileSystem, url::Origin::Create(origin_url),
-        FileSystemTypeToQuotaStorageType(type), -usage);
+    proxy->NotifyStorageModified(storage::QuotaClient::kFileSystem, origin,
+                                 FileSystemTypeToQuotaStorageType(type),
+                                 -usage);
   }
 
   if (result)

storage/browser/file_system/sandbox_file_system_backend_delegate.h

@@ -132,7 +132,7 @@ class COMPONENT_EXPORT(STORAGE_BROWSER) SandboxFileSystemBackendDelegate
   base::File::Error DeleteOriginDataOnFileTaskRunner(
       FileSystemContext* context,
       QuotaManagerProxy* proxy,
-      const GURL& origin_url,
+      const url::Origin& origin,
       FileSystemType type) override;
   void PerformStorageCleanupOnFileTaskRunner(FileSystemContext* context,
                                              QuotaManagerProxy* proxy,

storage/browser/test/test_file_system_backend.cc

@@ -65,7 +65,7 @@ class TestFileSystemBackend::QuotaUtil : public FileSystemQuotaUtil,
   base::File::Error DeleteOriginDataOnFileTaskRunner(
       FileSystemContext* context,
       QuotaManagerProxy* proxy,
-      const GURL& origin_url,
+      const url::Origin& origin,
       FileSystemType type) override {
     NOTREACHED();
     return base::File::FILE_OK;