[Downloads/History] Add tab-url and tab-referrer-url to DownloadRow

chrome/browser/download/download_history_unittest.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 "chrome/browser/download/download_history.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <utility>
 #include <vector>
@@ skipping 200 matching lines @@
   void CreateDownloadHistory(std::unique_ptr<InfoVector> infos) {
     DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     CHECK(infos.get());
     EXPECT_CALL(manager(), AddObserver(_)).WillOnce(WithArg<0>(Invoke(
         this, &DownloadHistoryTest::SetManagerObserver)));
     EXPECT_CALL(manager(), RemoveObserver(_));
     download_created_index_ = 0;
     for (size_t index = 0; index < infos->size(); ++index) {
       const history::DownloadRow& row = infos->at(index);
       content::MockDownloadManager::CreateDownloadItemAdapter adapter(
-          row.guid,
-          history::ToContentDownloadId(row.id),
-          row.current_path,
-          row.target_path,
-          row.url_chain,
-          row.referrer_url,
-          row.mime_type,
-          row.original_mime_type,
-          row.start_time,
-          row.end_time,
-          row.etag,
-          row.last_modified,
-          row.received_bytes,
-          row.total_bytes,
-          std::string(),
+          row.guid, history::ToContentDownloadId(row.id), row.current_path,
+          row.target_path, row.url_chain, row.referrer_url, row.tab_url,
+          row.tab_referrer_url, row.mime_type, row.original_mime_type,
+          row.start_time, row.end_time, row.etag, row.last_modified,
+          row.received_bytes, row.total_bytes, std::string(),
           history::ToContentDownloadState(row.state),
           history::ToContentDownloadDangerType(row.danger_type),
           history::ToContentDownloadInterruptReason(row.interrupt_reason),
           row.opened);
       EXPECT_CALL(manager(), MockCreateDownloadItem(adapter))
         .WillOnce(DoAll(
             InvokeWithoutArgs(
                 this, &DownloadHistoryTest::CallOnDownloadCreatedInOrder),
             Return(&item(index))));
     }
@@ skipping 83 matching lines @@
   }
 
   void InitBasicItem(const base::FilePath::CharType* path,
                      const char* url_string,
                      const char* referrer_string,
                      history::DownloadRow* info) {
     GURL url(url_string);
     GURL referrer(referrer_string);
     std::vector<GURL> url_chain;
     url_chain.push_back(url);
-    InitItem(base::GenerateGUID(),
-             static_cast<uint32_t>(items_.size() + 1),
-             base::FilePath(path),
-             base::FilePath(path),
-             url_chain,
-             referrer,
-             "application/octet-stream",
-             "application/octet-stream",
+    InitItem(base::GenerateGUID(), static_cast<uint32_t>(items_.size() + 1),
+             base::FilePath(path), base::FilePath(path), url_chain, referrer,
+             GURL("http://example.com/tab-url"),
+             GURL("http://example.com/tab-referrer-url"),
+             "application/octet-stream", "application/octet-stream",
              (base::Time::Now() - base::TimeDelta::FromMinutes(10)),
-             (base::Time::Now() - base::TimeDelta::FromMinutes(1)),
-             "Etag",
-             "abc",
-             100,
-             100,
-             content::DownloadItem::COMPLETE,
+             (base::Time::Now() - base::TimeDelta::FromMinutes(1)), "Etag",
+             "abc", 100, 100, content::DownloadItem::COMPLETE,
              content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
-             content::DOWNLOAD_INTERRUPT_REASON_NONE,
-             false,
-             std::string(),
-             std::string(),
-             info);
+             content::DOWNLOAD_INTERRUPT_REASON_NONE, false, std::string(),
+             std::string(), info);
   }
 
   void InitItem(const std::string& guid,
                 uint32_t id,
                 const base::FilePath& current_path,
                 const base::FilePath& target_path,
                 const std::vector<GURL>& url_chain,
                 const GURL& referrer,
+                const GURL& tab_url,
+                const GURL& tab_referrer_url,
                 const std::string& mime_type,
                 const std::string& original_mime_type,
                 const base::Time& start_time,
                 const base::Time& end_time,
                 const std::string& etag,
                 const std::string& last_modified,
                 int64_t received_bytes,
                 int64_t total_bytes,
                 content::DownloadItem::DownloadState state,
                 content::DownloadDangerType danger_type,
                 content::DownloadInterruptReason interrupt_reason,
                 bool opened,
                 const std::string& by_extension_id,
                 const std::string& by_extension_name,
                 history::DownloadRow* info) {
     DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
     size_t index = items_.size();
     StrictMockDownloadItem* mock_item = new StrictMockDownloadItem();
     items_.push_back(mock_item);
 
     info->current_path = current_path;
     info->target_path = target_path;
     info->url_chain = url_chain;
     info->referrer_url = referrer;
+    info->tab_url = tab_url;
+    info->tab_referrer_url = tab_referrer_url;
     info->mime_type = mime_type;
     info->original_mime_type = original_mime_type;
     info->start_time = start_time;
     info->end_time = end_time;
     info->etag = etag;
     info->last_modified = last_modified;
     info->received_bytes = received_bytes;
     info->total_bytes = total_bytes;
     info->state = history::ToHistoryDownloadState(state);
     info->danger_type = history::ToHistoryDownloadDangerType(danger_type);
@@ skipping 14 matching lines @@
     DCHECK_LE(1u, url_chain.size());
     EXPECT_CALL(item(index), GetURL())
         .WillRepeatedly(ReturnRefOfCopy(url_chain[0]));
     EXPECT_CALL(item(index), GetUrlChain())
         .WillRepeatedly(ReturnRefOfCopy(url_chain));
     EXPECT_CALL(item(index), GetMimeType()).WillRepeatedly(Return(mime_type));
     EXPECT_CALL(item(index), GetOriginalMimeType()).WillRepeatedly(Return(
         original_mime_type));
     EXPECT_CALL(item(index), GetReferrerUrl())
         .WillRepeatedly(ReturnRefOfCopy(referrer));
+    EXPECT_CALL(item(index), GetTabUrl())
+        .WillRepeatedly(ReturnRefOfCopy(tab_url));
+    EXPECT_CALL(item(index), GetTabReferrerUrl())
+        .WillRepeatedly(ReturnRefOfCopy(tab_referrer_url));
     EXPECT_CALL(item(index), GetStartTime()).WillRepeatedly(Return(start_time));
     EXPECT_CALL(item(index), GetEndTime()).WillRepeatedly(Return(end_time));
     EXPECT_CALL(item(index), GetETag()).WillRepeatedly(ReturnRefOfCopy(etag));
     EXPECT_CALL(item(index), GetLastModifiedTime())
         .WillRepeatedly(ReturnRefOfCopy(last_modified));
     EXPECT_CALL(item(index), GetReceivedBytes())
         .WillRepeatedly(Return(received_bytes));
     EXPECT_CALL(item(index), GetTotalBytes())
         .WillRepeatedly(Return(total_bytes));
     EXPECT_CALL(item(index), GetState()).WillRepeatedly(Return(state));
@@ skipping 466 matching lines @@
   FinishCreateDownload();
   EXPECT_TRUE(DownloadHistory::IsPersisted(&item(0)));
 
   // ItemAdded should call OnDownloadUpdated, which should detect that the item
   // changed while it was being added and call UpdateDownload immediately.
   info.opened = true;
   ExpectDownloadUpdated(info);
 }
 
 }  // anonymous namespace