[Downloads] Use the initiating StoragePartition for resumption.

chrome/browser/download/download_ui_controller_unittest.cc

 // Copyright 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 "chrome/browser/download/download_ui_controller.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 200 matching lines @@
       .WillRepeatedly(
           ReturnRefOfCopy(std::string("14CA04AF-ECEC-4B13-8829-817477EFAB83")));
   EXPECT_CALL(*item, GetTargetFilePath())
       .WillRepeatedly(
           ReturnRefOfCopy(base::FilePath(FILE_PATH_LITERAL("foo"))));
   EXPECT_CALL(*item, GetFullPath()).WillRepeatedly(
       ReturnRefOfCopy(base::FilePath(FILE_PATH_LITERAL("foo"))));
   EXPECT_CALL(*item, GetState())
       .WillRepeatedly(Return(content::DownloadItem::IN_PROGRESS));
   EXPECT_CALL(*item, GetUrlChain())
-      .WillRepeatedly(testing::ReturnRefOfCopy(std::vector<GURL>()));
+      .WillRepeatedly(ReturnRefOfCopy(std::vector<GURL>()));
   EXPECT_CALL(*item, GetReferrerUrl())
-      .WillRepeatedly(testing::ReturnRefOfCopy(GURL()));
+      .WillRepeatedly(ReturnRefOfCopy(GURL()));
   EXPECT_CALL(*item, GetTabUrl())
-      .WillRepeatedly(testing::ReturnRefOfCopy(GURL()));
+      .WillRepeatedly(ReturnRefOfCopy(GURL()));
   EXPECT_CALL(*item, GetTabReferrerUrl())
-      .WillRepeatedly(testing::ReturnRefOfCopy(GURL()));
+      .WillRepeatedly(ReturnRefOfCopy(GURL()));
+  EXPECT_CALL(*item, GetSiteInstanceUrl())

[svaldez, 2016/05/05 14:23:27]

nit: Same order as elsewhere (Referrer->SiteInstance->Tab->TabReferrer).

[asanka, 2016/05/05 17:38:05]

Done.

+      .WillRepeatedly(ReturnRefOfCopy(GURL()));
   EXPECT_CALL(*item, GetStartTime()).WillRepeatedly(Return(base::Time()));
   EXPECT_CALL(*item, GetEndTime()).WillRepeatedly(Return(base::Time()));
   EXPECT_CALL(*item, GetETag()).WillRepeatedly(ReturnRefOfCopy(std::string()));
   EXPECT_CALL(*item, GetLastModifiedTime())
       .WillRepeatedly(ReturnRefOfCopy(std::string()));
   EXPECT_CALL(*item, GetDangerType())
       .WillRepeatedly(Return(content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS));
   EXPECT_CALL(*item, GetLastReason())
       .WillRepeatedly(Return(content::DOWNLOAD_INTERRUPT_REASON_NONE));
   EXPECT_CALL(*item, GetReceivedBytes()).WillRepeatedly(Return(0));
   EXPECT_CALL(*item, GetTotalBytes()).WillRepeatedly(Return(0));
   EXPECT_CALL(*item, GetTargetDisposition()).WillRepeatedly(
       Return(content::DownloadItem::TARGET_DISPOSITION_OVERWRITE));
   EXPECT_CALL(*item, GetOpened()).WillRepeatedly(Return(false));
   EXPECT_CALL(*item, GetMimeType()).WillRepeatedly(Return(std::string()));
-  EXPECT_CALL(*item, GetURL()).WillRepeatedly(testing::ReturnRefOfCopy(GURL()));
+  EXPECT_CALL(*item, GetURL()).WillRepeatedly(ReturnRefOfCopy(GURL()));
   EXPECT_CALL(*item, GetWebContents()).WillRepeatedly(Return(nullptr));
   EXPECT_CALL(*item, IsTemporary()).WillRepeatedly(Return(false));
   return item;
 }
 
 std::unique_ptr<DownloadUIController::Delegate>
 DownloadUIControllerTest::GetTestDelegate() {
   std::unique_ptr<DownloadUIController::Delegate> delegate(
       new TestDelegate(notified_item_receiver_factory_.GetWeakPtr()));
   return delegate;
@@ skipping 99 matching lines @@
   // DownloadUIController. It should ignore the download since it's marked as
   // being restored from history.
   ASSERT_TRUE(manager_observer());
   manager_observer()->OnDownloadCreated(manager(), item.get());
 
   // Finally, the expectation we've been waiting for:
   EXPECT_FALSE(notified_item());
 }
 
 } // namespace