Change GetBaseDirectoryForOriginAndType to use url::Origin

This CL update the function GetBaseDirectoryForOriginAndType to use
url::Origin instead of GURL.

Bug: 598424
Change-Id: I0385e929b7cc8b6a12aae23a4d667240e7957f1d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2038913
Commit-Queue: Victor Costan <pwnall@chromium.org>
Reviewed-by: Victor Costan <pwnall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#738810}

storage/browser/file_system/sandbox_file_system_backend_delegate.cc

@@ -241,12 +241,12 @@ SandboxFileSystemBackendDelegate::CreateOriginEnumerator() {
 
 base::FilePath
 SandboxFileSystemBackendDelegate::GetBaseDirectoryForOriginAndType(
-    const GURL& origin_url,
+    const url::Origin& origin,
     FileSystemType type,
     bool create) {
   base::File::Error error = base::File::FILE_OK;
   base::FilePath path = obfuscated_file_util()->GetDirectoryForOriginAndType(
-      url::Origin::Create(origin_url), GetTypeString(type), create, &error);
+      origin, GetTypeString(type), create, &error);
   if (error != base::File::FILE_OK)
     return base::FilePath();
   return path;
@@ -420,7 +420,7 @@ int64_t SandboxFileSystemBackendDelegate::GetOriginUsageOnFileTaskRunner(
     return RecalculateUsage(file_system_context, origin.GetURL(), type);
 
   base::FilePath base_path =
-      GetBaseDirectoryForOriginAndType(origin.GetURL(), type, false);
+      GetBaseDirectoryForOriginAndType(origin, type, false);
   if (base_path.empty() ||
       !obfuscated_file_util()->delegate()->DirectoryExists(base_path)) {
     return 0;
@@ -684,21 +684,21 @@ void SandboxFileSystemBackendDelegate::CopyFileSystem(
     SandboxFileSystemBackendDelegate* destination) {
   DCHECK(file_task_runner()->RunsTasksInCurrentSequence());
 
-  base::FilePath base_path =
-      GetBaseDirectoryForOriginAndType(origin_url, type, false /* create */);
+  base::FilePath base_path = GetBaseDirectoryForOriginAndType(
+      url::Origin::Create(origin_url), type, false /* create */);
   if (base::PathExists(base_path)) {
     // Delete any existing file system directories in the destination. A
     // previously failed migration
     // may have left behind partially copied directories.
     base::FilePath dest_path = destination->GetBaseDirectoryForOriginAndType(
-        origin_url, type, false /* create */);
+        url::Origin::Create(origin_url), type, false /* create */);
 
     // Make sure we're not about to delete our own file system.
     CHECK_NE(base_path.value(), dest_path.value());
     base::DeleteFileRecursively(dest_path);
 
     dest_path = destination->GetBaseDirectoryForOriginAndType(
-        origin_url, type, true /* create */);
+        url::Origin::Create(origin_url), type, true /* create */);
 
     obfuscated_file_util()->CloseFileSystemForOriginAndType(
         url::Origin::Create(origin_url), GetTypeString(type));

storage/browser/file_system/sandbox_file_system_backend_delegate.h

@@ -104,7 +104,7 @@ class COMPONENT_EXPORT(STORAGE_BROWSER) SandboxFileSystemBackendDelegate
   // the 'unique' part.)
   // Returns an empty path if the given type is invalid.
   // This method can only be called on the file thread.
-  base::FilePath GetBaseDirectoryForOriginAndType(const GURL& origin_url,
+  base::FilePath GetBaseDirectoryForOriginAndType(const url::Origin& origin,
                                                   FileSystemType type,
                                                   bool create);
 

storage/browser/file_system/sandbox_file_system_backend_unittest.cc

@@ -112,8 +112,8 @@ class SandboxFileSystemBackendTest
 
   void CreateOriginTypeDirectory(const GURL& origin,
                                  storage::FileSystemType type) {
-    base::FilePath target =
-        delegate_->GetBaseDirectoryForOriginAndType(origin, type, true);
+    base::FilePath target = delegate_->GetBaseDirectoryForOriginAndType(
+        url::Origin::Create(origin), type, true);
     ASSERT_TRUE(!target.empty());
     ASSERT_TRUE(base::DirectoryExists(target));
   }
@@ -131,8 +131,8 @@ class SandboxFileSystemBackendTest
     if (error != base::File::FILE_OK)
       return false;
     base::FilePath returned_root_path =
-        delegate_->GetBaseDirectoryForOriginAndType(origin_url, type,
-                                                    false /* create */);
+        delegate_->GetBaseDirectoryForOriginAndType(
+            url::Origin::Create(origin_url), type, false /* create */);
     if (root_path)
       *root_path = returned_root_path;
     return !returned_root_path.empty();

storage/browser/test/sandbox_file_system_test_helper.cc

@@ -68,7 +68,7 @@ void SandboxFileSystemTestHelper::TearDown() {
 
 base::FilePath SandboxFileSystemTestHelper::GetOriginRootPath() {
   return file_system_context_->sandbox_delegate()
-      ->GetBaseDirectoryForOriginAndType(origin_.GetURL(), type_, false);
+      ->GetBaseDirectoryForOriginAndType(origin_, type_, false);
 }
 
 base::FilePath SandboxFileSystemTestHelper::GetLocalPath(
@@ -163,7 +163,7 @@ void SandboxFileSystemTestHelper::SetUpFileSystem() {
 
   // Prepare the origin's root directory.
   file_system_context_->sandbox_delegate()->GetBaseDirectoryForOriginAndType(
-      origin_.GetURL(), type_, true /* create */);
+      origin_, type_, true /* create */);
 
   base::FilePath usage_cache_path = GetUsageCachePath();
   if (!usage_cache_path.empty())