IndexedDB: Use url::Origin rather than GURL for representing origins

content/browser/indexed_db/indexed_db_internals_ui.cc

 // Copyright (c) 2013 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/indexed_db/indexed_db_internals_ui.h"
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
 #include "base/threading/platform_thread.h"
 #include "base/values.h"
 #include "content/browser/indexed_db/indexed_db_context_impl.h"
 #include "content/grit/content_resources.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/download_url_parameters.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/common/url_constants.h"
 #include "storage/common/database/database_identifier.h"
 #include "third_party/zlib/google/zip.h"
 #include "ui/base/text/bytes_formatting.h"
+#include "url/origin.h"
 
 namespace content {
 
 namespace {
 
 bool AllowWhitelistedPaths(const std::vector<base::FilePath>& allowed_paths,
                            const base::FilePath& candidate_path) {
   for (const base::FilePath& allowed_path : allowed_paths) {
     if (allowed_path.IsParent(candidate_path))
       return true;
@@ skipping 91 matching lines @@
   if (storage_partition->GetPath() == partition_path) {
     *result_partition = storage_partition;
     *result_context = static_cast<IndexedDBContextImpl*>(
         storage_partition->GetIndexedDBContext());
   }
 }
 
 bool IndexedDBInternalsUI::GetOriginData(
     const base::ListValue* args,
     base::FilePath* partition_path,
-    GURL* origin_url,
+    url::Origin* origin,
     scoped_refptr<IndexedDBContextImpl>* context) {
   base::FilePath::StringType path_string;
   if (!args->GetString(0, &path_string))
     return false;
   *partition_path = base::FilePath(path_string);
 
   std::string url_string;
   if (!args->GetString(1, &url_string))
     return false;
 
-  *origin_url = GURL(url_string);
+  *origin = url::Origin(GURL(url_string));
 
-  return GetOriginContext(*partition_path, *origin_url, context);
+  return GetOriginContext(*partition_path, *origin, context);
 }
 
 bool IndexedDBInternalsUI::GetOriginContext(
     const base::FilePath& path,
-    const GURL& origin_url,
+    const url::Origin& origin,
     scoped_refptr<IndexedDBContextImpl>* context) {
   // search the origins to find the right context
   BrowserContext* browser_context =
       web_ui()->GetWebContents()->GetBrowserContext();
 
   StoragePartition* result_partition;
   BrowserContext::StoragePartitionCallback cb =
       base::Bind(&FindContext, path, &result_partition, context);
   BrowserContext::ForEachStoragePartition(browser_context, cb);
 
   if (!result_partition || !(context->get()))
     return false;
 
   return true;
 }
 
 void IndexedDBInternalsUI::DownloadOriginData(const base::ListValue* args) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   base::FilePath partition_path;
-  GURL origin_url;
+  url::Origin origin;
   scoped_refptr<IndexedDBContextImpl> context;
-  if (!GetOriginData(args, &partition_path, &origin_url, &context))
+  if (!GetOriginData(args, &partition_path, &origin, &context))
     return;
 
   DCHECK(context.get());
   context->TaskRunner()->PostTask(
       FROM_HERE,
       base::Bind(&IndexedDBInternalsUI::DownloadOriginDataOnIndexedDBThread,
-                 base::Unretained(this),
-                 partition_path,
-                 context,
-                 origin_url));
+                 base::Unretained(this), partition_path, context, origin));
 }
 
 void IndexedDBInternalsUI::ForceCloseOrigin(const base::ListValue* args) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   base::FilePath partition_path;
-  GURL origin_url;
+  url::Origin origin;
   scoped_refptr<IndexedDBContextImpl> context;
-  if (!GetOriginData(args, &partition_path, &origin_url, &context))
+  if (!GetOriginData(args, &partition_path, &origin, &context))
     return;
 
   context->TaskRunner()->PostTask(
       FROM_HERE,
       base::Bind(&IndexedDBInternalsUI::ForceCloseOriginOnIndexedDBThread,
-                 base::Unretained(this),
-                 partition_path,
-                 context,
-                 origin_url));
+                 base::Unretained(this), partition_path, context, origin));
 }
 
 void IndexedDBInternalsUI::DownloadOriginDataOnIndexedDBThread(
     const base::FilePath& partition_path,
     const scoped_refptr<IndexedDBContextImpl> context,
-    const GURL& origin_url) {
+    const url::Origin& origin) {
   DCHECK(context->TaskRunner()->RunsTasksOnCurrentThread());
   // This runs on the IndexedDB task runner to prevent script from reopening
   // the origin while we are zipping.
 
   // Make sure the database hasn't been deleted since the page was loaded.
-  if (!context->HasOrigin(origin_url))
+  if (!context->HasOrigin(origin))
     return;
 
-  context->ForceClose(origin_url,
-                      IndexedDBContextImpl::FORCE_CLOSE_INTERNALS_PAGE);
-  size_t connection_count = context->GetConnectionCount(origin_url);
+  context->ForceClose(origin, IndexedDBContextImpl::FORCE_CLOSE_INTERNALS_PAGE);
+  size_t connection_count = context->GetConnectionCount(origin);
 
   base::ScopedTempDir temp_dir;
   if (!temp_dir.CreateUniqueTempDir())
     return;
 
   // This will get cleaned up on the File thread after the download
   // has completed.
   base::FilePath temp_path = temp_dir.Take();
 
-  std::string origin_id = storage::GetIdentifierFromOrigin(origin_url);
+  std::string origin_id =
+      storage::GetIdentifierFromOrigin(GURL(origin.Serialize()));
   base::FilePath zip_path =
       temp_path.AppendASCII(origin_id).AddExtension(FILE_PATH_LITERAL("zip"));
 
-  std::vector<base::FilePath> paths = context->GetStoragePaths(origin_url);
+  std::vector<base::FilePath> paths = context->GetStoragePaths(origin);
   zip::ZipWithFilterCallback(context->data_path(), zip_path,
                              base::Bind(AllowWhitelistedPaths, paths));
 
-  BrowserThread::PostTask(BrowserThread::UI,
-                          FROM_HERE,
-                          base::Bind(&IndexedDBInternalsUI::OnDownloadDataReady,
-                                     base::Unretained(this),
-                                     partition_path,
-                                     origin_url,
-                                     temp_path,
-                                     zip_path,
-                                     connection_count));
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
+      base::Bind(&IndexedDBInternalsUI::OnDownloadDataReady,
+                 base::Unretained(this), partition_path, origin, temp_path,
+                 zip_path, connection_count));
 }
 
 void IndexedDBInternalsUI::ForceCloseOriginOnIndexedDBThread(
     const base::FilePath& partition_path,
     const scoped_refptr<IndexedDBContextImpl> context,
-    const GURL& origin_url) {
+    const url::Origin& origin) {
   DCHECK(context->TaskRunner()->RunsTasksOnCurrentThread());
 
   // Make sure the database hasn't been deleted since the page was loaded.
-  if (!context->HasOrigin(origin_url))
+  if (!context->HasOrigin(origin))
     return;
 
-  context->ForceClose(origin_url,
-                      IndexedDBContextImpl::FORCE_CLOSE_INTERNALS_PAGE);
-  size_t connection_count = context->GetConnectionCount(origin_url);
+  context->ForceClose(origin, IndexedDBContextImpl::FORCE_CLOSE_INTERNALS_PAGE);
+  size_t connection_count = context->GetConnectionCount(origin);
 
-  BrowserThread::PostTask(BrowserThread::UI,
-                          FROM_HERE,
-                          base::Bind(&IndexedDBInternalsUI::OnForcedClose,
-                                     base::Unretained(this),
-                                     partition_path,
-                                     origin_url,
-                                     connection_count));
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
+      base::Bind(&IndexedDBInternalsUI::OnForcedClose, base::Unretained(this),
+                 partition_path, origin, connection_count));
 }
 
 void IndexedDBInternalsUI::OnForcedClose(const base::FilePath& partition_path,
-                                         const GURL& origin_url,
+                                         const url::Origin& origin,
                                          size_t connection_count) {
   web_ui()->CallJavascriptFunction(
-      "indexeddb.onForcedClose",
-      base::StringValue(partition_path.value()),
-      base::StringValue(origin_url.spec()),
+      "indexeddb.onForcedClose", base::StringValue(partition_path.value()),
+      base::StringValue(origin.Serialize()),
       base::FundamentalValue(static_cast<double>(connection_count)));
 }
 
 void IndexedDBInternalsUI::OnDownloadDataReady(
     const base::FilePath& partition_path,
-    const GURL& origin_url,
+    const url::Origin& origin,
     const base::FilePath temp_path,
     const base::FilePath zip_path,
     size_t connection_count) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   const GURL url = GURL(FILE_PATH_LITERAL("file://") + zip_path.value());
   BrowserContext* browser_context =
       web_ui()->GetWebContents()->GetBrowserContext();
   scoped_ptr<DownloadUrlParameters> dl_params(
       DownloadUrlParameters::FromWebContents(web_ui()->GetWebContents(), url));
   DownloadManager* dlm = BrowserContext::GetDownloadManager(browser_context);
 
   const GURL referrer(web_ui()->GetWebContents()->GetLastCommittedURL());
   dl_params->set_referrer(content::Referrer::SanitizeForRequest(
       url, content::Referrer(referrer, blink::WebReferrerPolicyDefault)));
 
   // This is how to watch for the download to finish: first wait for it
   // to start, then attach a DownloadItem::Observer to observe the
   // state change to the finished state.
   dl_params->set_callback(base::Bind(&IndexedDBInternalsUI::OnDownloadStarted,
-                                     base::Unretained(this),
-                                     partition_path,
-                                     origin_url,
-                                     temp_path,
-                                     connection_count));
+                                     base::Unretained(this), partition_path,
+                                     origin, temp_path, connection_count));
   dlm->DownloadUrl(std::move(dl_params));
 }
 
 // The entire purpose of this class is to delete the temp file after
 // the download is complete.
 class FileDeleter : public DownloadItem::Observer {
  public:
   explicit FileDeleter(const base::FilePath& temp_dir) : temp_dir_(temp_dir) {}
   ~FileDeleter() override;
 
@@ skipping 25 matching lines @@
 }
 
 FileDeleter::~FileDeleter() {
   base::ScopedTempDir path;
   bool will_delete = path.Set(temp_dir_);
   DCHECK(will_delete);
 }
 
 void IndexedDBInternalsUI::OnDownloadStarted(
     const base::FilePath& partition_path,
-    const GURL& origin_url,
+    const url::Origin& origin,
     const base::FilePath& temp_path,
     size_t connection_count,
     DownloadItem* item,
     DownloadInterruptReason interrupt_reason) {
-
   if (interrupt_reason != DOWNLOAD_INTERRUPT_REASON_NONE) {
     LOG(ERROR) << "Error downloading database dump: "
                << DownloadInterruptReasonToString(interrupt_reason);
     return;
   }
 
   item->AddObserver(new FileDeleter(temp_path));
   web_ui()->CallJavascriptFunction(
       "indexeddb.onOriginDownloadReady",
       base::StringValue(partition_path.value()),
-      base::StringValue(origin_url.spec()),
+      base::StringValue(origin.Serialize()),
       base::FundamentalValue(static_cast<double>(connection_count)));
 }
 
 }  // namespace content