[Downloads] Use the initiating StoragePartition for resumption.

components/history/core/browser/download_database.cc

 // Copyright (c) 2012 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 "components/history/core/browser/download_database.h"
 
 #include <limits>
 #include <memory>
 #include <string>
 #include <vector>
@@ skipping 237 matching lines @@
       " substr(hex(randomblob(2)),2),"
       " hex(randomblob(6)))";
   return GetDB().Execute(kMigrateGuidsQuery);
 }
 
 bool DownloadDatabase::MigrateDownloadTabUrl() {
   return EnsureColumnExists("tab_url", "VARCHAR NOT NULL DEFAULT ''") &&
          EnsureColumnExists("tab_referrer_url", "VARCHAR NOT NULL DEFAULT ''");
 }
 
+bool DownloadDatabase::MigrateDownloadSiteInstanceUrl() {
+  return EnsureColumnExists("site_instance_url", "VARCHAR NOT NULL DEFAULT ''");
+}
+
 bool DownloadDatabase::InitDownloadTable() {
   const char kSchema[] =
       "CREATE TABLE downloads ("
-      "id INTEGER PRIMARY KEY,"             // Primary key.
-      "guid VARCHAR NOT NULL,"              // GUID.
-      "current_path LONGVARCHAR NOT NULL,"  // Current disk location
-      "target_path LONGVARCHAR NOT NULL,"   // Final disk location
-      "start_time INTEGER NOT NULL,"        // When the download was started.
-      "received_bytes INTEGER NOT NULL,"    // Total size downloaded.
-      "total_bytes INTEGER NOT NULL,"       // Total size of the download.
-      "state INTEGER NOT NULL,"             // 1=complete, 4=interrupted
-      "danger_type INTEGER NOT NULL,"       // Danger type, validated.
-      "interrupt_reason INTEGER NOT NULL,"  // DownloadInterruptReason
-      "hash BLOB NOT NULL,"                 // Raw SHA-256 hash of contents.
-      "end_time INTEGER NOT NULL,"          // When the download completed.
-      "opened INTEGER NOT NULL,"            // 1 if it has ever been opened
-                                            // else 0
-      "referrer VARCHAR NOT NULL,"          // HTTP Referrer
-      "tab_url VARCHAR NOT NULL,"           // Tab URL for initiator.
-      "tab_referrer_url VARCHAR NOT NULL,"  // Tag referrer URL for initiator.
-      "http_method VARCHAR NOT NULL,"       // HTTP method.
-      "by_ext_id VARCHAR NOT NULL,"         // ID of extension that started the
-                                            // download
-      "by_ext_name VARCHAR NOT NULL,"       // name of extension
-      "etag VARCHAR NOT NULL,"              // ETag
-      "last_modified VARCHAR NOT NULL,"     // Last-Modified header
-      "mime_type VARCHAR(255) NOT NULL,"    // MIME type.
+      "id INTEGER PRIMARY KEY,"              // Primary key.
+      "guid VARCHAR NOT NULL,"               // GUID.
+      "current_path LONGVARCHAR NOT NULL,"   // Current disk location
+      "target_path LONGVARCHAR NOT NULL,"    // Final disk location
+      "start_time INTEGER NOT NULL,"         // When the download was started.
+      "received_bytes INTEGER NOT NULL,"     // Total size downloaded.
+      "total_bytes INTEGER NOT NULL,"        // Total size of the download.
+      "state INTEGER NOT NULL,"              // 1=complete, 4=interrupted
+      "danger_type INTEGER NOT NULL,"        // Danger type, validated.
+      "interrupt_reason INTEGER NOT NULL,"   // DownloadInterruptReason
+      "hash BLOB NOT NULL,"                  // Raw SHA-256 hash of contents.
+      "end_time INTEGER NOT NULL,"           // When the download completed.
+      "opened INTEGER NOT NULL,"             // 1 if it has ever been opened
+                                             // else 0
+      "referrer VARCHAR NOT NULL,"           // HTTP Referrer
+      "site_instance_url VARCHAR NOT NULL,"  // Site URL for initiating site

[Charlie Reis, 2016/05/05 21:43:22]

site_url (see comment in download_item.h)

[asanka, 2016/05/07 00:24:45]

Done. Here and elsewhere.

+                                             // instance.
+      "tab_url VARCHAR NOT NULL,"            // Tab URL for initiator.
+      "tab_referrer_url VARCHAR NOT NULL,"   // Tag referrer URL for initiator.
+      "http_method VARCHAR NOT NULL,"        // HTTP method.
+      "by_ext_id VARCHAR NOT NULL,"          // ID of extension that started the
+                                             // download
+      "by_ext_name VARCHAR NOT NULL,"        // name of extension
+      "etag VARCHAR NOT NULL,"               // ETag
+      "last_modified VARCHAR NOT NULL,"      // Last-Modified header
+      "mime_type VARCHAR(255) NOT NULL,"     // MIME type.
       "original_mime_type VARCHAR(255) NOT NULL)";  // Original MIME type.
 
   const char kUrlChainSchema[] =
       "CREATE TABLE downloads_url_chains ("
       "id INTEGER NOT NULL,"                // downloads.id.
       "chain_index INTEGER NOT NULL,"       // Index of url in chain
                                             // 0 is initial target,
                                             // MAX is target after redirects.
       "url LONGVARCHAR NOT NULL, "          // URL.
       "PRIMARY KEY (id, chain_index) )";
@@ skipping 42 matching lines @@
   results->clear();
   std::set<uint32_t> ids;
 
   std::map<uint32_t, DownloadRow*> info_map;
 
   sql::Statement statement_main(GetDB().GetCachedStatement(
       SQL_FROM_HERE,
       "SELECT id, guid, current_path, target_path, mime_type, "
       "original_mime_type, start_time, received_bytes, total_bytes, state, "
       "danger_type, interrupt_reason, hash, end_time, opened, referrer, "
-      "tab_url, tab_referrer_url, http_method, by_ext_id, by_ext_name, etag, "
-      "last_modified FROM downloads ORDER BY start_time"));
+      "site_instance_url, tab_url, tab_referrer_url, http_method, by_ext_id, "
+      "by_ext_name, etag, last_modified FROM downloads ORDER BY start_time"));
 
   while (statement_main.Step()) {
     std::unique_ptr<DownloadRow> info(new DownloadRow());
     int column = 0;
 
     // SQLITE does not have unsigned integers, so explicitly handle negative
     // |id|s instead of casting them to very large uint32s, which would break
     // the max(id) logic in GetNextDownloadId().
     int64_t signed_id = statement_main.ColumnInt64(column++);
     info->id = IntToDownloadId(signed_id);
@@ skipping 12 matching lines @@
       UMA_HISTOGRAM_COUNTS("Download.DatabaseInvalidState", state);
     info->danger_type =
         IntToDownloadDangerType(statement_main.ColumnInt(column++));
     info->interrupt_reason =
         IntToDownloadInterruptReason(statement_main.ColumnInt(column++));
     statement_main.ColumnBlobAsString(column++, &info->hash);
     info->end_time =
         base::Time::FromInternalValue(statement_main.ColumnInt64(column++));
     info->opened = statement_main.ColumnInt(column++) != 0;
     info->referrer_url = GURL(statement_main.ColumnString(column++));
+    info->site_instance_url = GURL(statement_main.ColumnString(column++));
     info->tab_url = GURL(statement_main.ColumnString(column++));
     info->tab_referrer_url = GURL(statement_main.ColumnString(column++));
     info->http_method = statement_main.ColumnString(column++);
     info->by_ext_id = statement_main.ColumnString(column++);
     info->by_ext_name = statement_main.ColumnString(column++);
     info->etag = statement_main.ColumnString(column++);
     info->last_modified = statement_main.ColumnString(column++);
 
     // If the record is corrupted, note that and drop it.
     // http://crbug.com/251269
@@ skipping 154 matching lines @@
 
   if (info.danger_type == DownloadDangerType::INVALID)
     return false;
 
   {
     sql::Statement statement_insert(GetDB().GetCachedStatement(
         SQL_FROM_HERE,
         "INSERT INTO downloads "
         "(id, guid, current_path, target_path, mime_type, original_mime_type, "
         " start_time, received_bytes, total_bytes, state, danger_type, "
-        " interrupt_reason, hash, end_time, opened, referrer, tab_url, "
-        " tab_referrer_url, http_method, by_ext_id, by_ext_name, etag, "
-        " last_modified) "
+        " interrupt_reason, hash, end_time, opened, referrer, "
+        " site_instance_url, tab_url, tab_referrer_url, http_method, "
+        " by_ext_id, by_ext_name, etag, last_modified) "
         "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, "
         "        ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, "
-        "        ?, ?, ?)"));
+        "        ?, ?, ?, ?)"));
 
     int column = 0;
     statement_insert.BindInt(column++, DownloadIdToInt(info.id));
     statement_insert.BindString(column++, info.guid);
     BindFilePath(statement_insert, info.current_path, column++);
     BindFilePath(statement_insert, info.target_path, column++);
     statement_insert.BindString(column++, info.mime_type);
     statement_insert.BindString(column++, info.original_mime_type);
     statement_insert.BindInt64(column++, info.start_time.ToInternalValue());
     statement_insert.BindInt64(column++, info.received_bytes);
     statement_insert.BindInt64(column++, info.total_bytes);
     statement_insert.BindInt(column++, DownloadStateToInt(info.state));
     statement_insert.BindInt(column++,
                              DownloadDangerTypeToInt(info.danger_type));
     statement_insert.BindInt(
         column++, DownloadInterruptReasonToInt(info.interrupt_reason));
     statement_insert.BindBlob(column++, info.hash.data(), info.hash.size());
     statement_insert.BindInt64(column++, info.end_time.ToInternalValue());
     statement_insert.BindInt(column++, info.opened ? 1 : 0);
     statement_insert.BindString(column++, info.referrer_url.spec());
+    statement_insert.BindString(column++, info.site_instance_url.spec());
     statement_insert.BindString(column++, info.tab_url.spec());
     statement_insert.BindString(column++, info.tab_referrer_url.spec());
     statement_insert.BindString(column++, info.http_method);
     statement_insert.BindString(column++, info.by_ext_id);
     statement_insert.BindString(column++, info.by_ext_name);
     statement_insert.BindString(column++, info.etag);
     statement_insert.BindString(column++, info.last_modified);
     if (!statement_insert.Run()) {
       // GetErrorCode() returns a bitmask where the lower byte is a more general
       // code and the upper byte is a more specific code. In order to save
@@ skipping 69 matching lines @@
 size_t DownloadDatabase::CountDownloads() {
   EnsureInProgressEntriesCleanedUp();
 
   sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
       "SELECT count(*) from downloads"));
   statement.Step();
   return statement.ColumnInt(0);
 }
 
 }  // namespace history