Merge from Chromium at DEPS revision r216972

This commit was generated by merge_to_master.py.

Change-Id: I01cb28d94e3fcf99e3624d75cafa50d929787ddd

1 files changed, 15 insertions, 2 deletions

diff --git a/content/browser/download/download_manager_impl_unittest.cc b/content/browser/download/download_manager_impl_unittest.cc
index 2e9eff427e..eba28339b5 100644
--- a/content/browser/download/download_manager_impl_unittest.cc
+++ b/content/browser/download/download_manager_impl_unittest.cc
@@ -78,6 +78,8 @@ class MockDownloadItemImpl : public DownloadItemImpl {
           GURL(),
           base::Time(),
           base::Time(),
+          std::string(),
+          std::string(),
           0,
           0,
           DownloadItem::COMPLETE,
@@ -193,6 +195,7 @@ class MockDownloadManagerDelegate : public DownloadManagerDelegate {
   MOCK_METHOD5(ChooseSavePath, void(
       WebContents*, const base::FilePath&, const base::FilePath::StringType&,
       bool, const SavePackagePathPickedCallback&));
+  MOCK_CONST_METHOD0(ApplicationClientIdForFileScanning, std::string());
 };
 
 MockDownloadManagerDelegate::MockDownloadManagerDelegate() {}
@@ -231,6 +234,8 @@ class MockDownloadItemFactory
       const GURL& referrer_url,
       const base::Time& start_time,
       const base::Time& end_time,
+      const std::string& etag,
+      const std::string& last_modofied,
       int64 received_bytes,
       int64 total_bytes,
       DownloadItem::DownloadState state,
@@ -294,6 +299,8 @@ DownloadItemImpl* MockDownloadItemFactory::CreatePersistedItem(
     const GURL& referrer_url,
     const base::Time& start_time,
     const base::Time& end_time,
+    const std::string& etag,
+    const std::string& last_modified,
     int64 received_bytes,
     int64 total_bytes,
     DownloadItem::DownloadState state,
@@ -357,7 +364,7 @@ class MockDownloadFileFactory
   virtual ~MockDownloadFileFactory() {}
 
   // Overridden method from DownloadFileFactory
-  MOCK_METHOD8(MockCreateFile, DownloadFile*(
+  MOCK_METHOD8(MockCreateFile, MockDownloadFile*(
     const DownloadSaveInfo&,
     const base::FilePath&,
     const GURL&, const GURL&, bool,
@@ -587,9 +594,15 @@ TEST_F(DownloadManagerTest, StartDownload) {
   EXPECT_CALL(GetMockDownloadManagerDelegate(), GetSaveDir(_, _, _, _));
   EXPECT_CALL(GetMockDownloadManagerDelegate(), GenerateFileHash())
       .WillOnce(Return(true));
+  EXPECT_CALL(GetMockDownloadManagerDelegate(),
+              ApplicationClientIdForFileScanning())
+      .WillRepeatedly(Return("client-id"));
+  MockDownloadFile* mock_file = new MockDownloadFile;
+  EXPECT_CALL(*mock_file, SetClientGuid("client-id"));
   EXPECT_CALL(*mock_download_file_factory_.get(),
               MockCreateFile(Ref(*info->save_info.get()), _, _, _, true,
-                             stream.get(), _, _));
+                             stream.get(), _, _))
+      .WillOnce(Return(mock_file));
 
   download_manager_->StartDownload(
       info.Pass(), stream.Pass(), DownloadUrlParameters::OnStartedCallback());