Make DownloadHistory observe manager, items

content/browser/download/download_item_impl_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 "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/threading/thread.h"
 #include "content/browser/download/byte_stream.h"
 #include "content/browser/download/download_create_info.h"
 #include "content/browser/download/download_file_factory.h"
@@ skipping 27 matching lines @@
   MOCK_METHOD2(ShouldOpenDownload,
                bool(DownloadItemImpl*, const ShouldOpenDownloadCallback&));
   MOCK_METHOD1(ShouldOpenFileBasedOnExtension, bool(const FilePath&));
   MOCK_METHOD1(CheckForFileRemoval, void(DownloadItemImpl*));
   MOCK_CONST_METHOD0(GetBrowserContext, BrowserContext*());
   MOCK_METHOD1(UpdatePersistence, void(DownloadItemImpl*));
   MOCK_METHOD1(DownloadStopped, void(DownloadItemImpl*));
   MOCK_METHOD1(DownloadCompleted, void(DownloadItemImpl*));
   MOCK_METHOD1(DownloadOpened, void(DownloadItemImpl*));
   MOCK_METHOD1(DownloadRemoved, void(DownloadItemImpl*));
-  MOCK_METHOD1(DownloadRenamedToIntermediateName,
-               void(DownloadItemImpl*));
-  MOCK_METHOD1(DownloadRenamedToFinalName, void(DownloadItemImpl*));
+  MOCK_METHOD1(ShowDownloadInBrowser, void(DownloadItemImpl*));
   MOCK_CONST_METHOD1(AssertStateConsistent, void(DownloadItemImpl*));
 };
 
 class MockRequestHandle : public DownloadRequestHandleInterface {
  public:
   MOCK_CONST_METHOD0(GetWebContents, WebContents*());
   MOCK_CONST_METHOD0(GetDownloadManager, DownloadManager*());
   MOCK_CONST_METHOD0(PauseRequest, void());
   MOCK_CONST_METHOD0(ResumeRequest, void());
   MOCK_CONST_METHOD0(CancelRequest, void());
@@ skipping 377 matching lines @@
   MockDownloadFile* mock_download_file(new MockDownloadFile);
   scoped_ptr<DownloadFile> download_file(mock_download_file);
   DownloadItemImpl* item = CreateDownloadItem(DownloadItem::IN_PROGRESS);
   EXPECT_CALL(*mock_download_file, Initialize(_));
   item->Start(download_file.Pass());
 
   CleanupItem(item, mock_download_file);
 }
 
 // Test that the delegate is invoked after the download file is renamed.
-// Delegate::DownloadRenamedToIntermediateName() should be invoked when the
-// download is renamed to the intermediate name.
-// Delegate::DownloadRenamedToFinalName() should be invoked after the final
-// rename.
 TEST_F(DownloadItemTest, CallbackAfterRename) {
   DownloadItemImpl* item = CreateDownloadItem(DownloadItem::IN_PROGRESS);
   DownloadItemImplDelegate::DownloadTargetCallback callback;
   MockDownloadFile* download_file =
       AddDownloadFileToDownloadItem(item, &callback);
   FilePath final_path(FilePath(kDummyPath).AppendASCII("foo.bar"));
   FilePath intermediate_path(final_path.InsertBeforeExtensionASCII("x"));
   FilePath new_intermediate_path(final_path.InsertBeforeExtensionASCII("y"));
   EXPECT_CALL(*download_file, RenameAndUniquify(intermediate_path, _))
       .WillOnce(ScheduleRenameCallback(new_intermediate_path));
+  EXPECT_CALL(*mock_delegate(), ShowDownloadInBrowser(item))
+      .Times(1);
 
-  // DownloadItemImpl should invoke this callback on the delegate once the
-  // download is renamed to the intermediate name. Also check that GetFullPath()
-  // returns the intermediate path at the time of the call.
-  EXPECT_CALL(*mock_delegate(),
-              DownloadRenamedToIntermediateName(
-                  AllOf(item,
-                        Property(&DownloadItem::GetFullPath,
-                                 new_intermediate_path))));
   callback.Run(final_path, DownloadItem::TARGET_DISPOSITION_OVERWRITE,
                DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, intermediate_path);
   RunAllPendingInMessageLoops();
   // All the callbacks should have happened by now.
   ::testing::Mock::VerifyAndClearExpectations(download_file);
   ::testing::Mock::VerifyAndClearExpectations(mock_delegate());
 
   item->OnAllDataSaved("");
   EXPECT_CALL(*download_file, RenameAndAnnotate(final_path, _))
       .WillOnce(ScheduleRenameCallback(final_path));
-  // DownloadItemImpl should invoke this callback on the delegate after the
-  // final rename has completed. Also check that GetFullPath() and
-  // GetTargetFilePath() return the final path at the time of the call.
-  EXPECT_CALL(*mock_delegate(),
-              DownloadRenamedToFinalName(
-                  AllOf(item,
-                        Property(&DownloadItem::GetFullPath, final_path),
-                        Property(&DownloadItem::GetTargetFilePath,
-                                 final_path))));
   EXPECT_CALL(*mock_delegate(), DownloadCompleted(item));
   EXPECT_CALL(*mock_delegate(), ShouldOpenDownload(item, _))
       .WillOnce(Return(true));
   EXPECT_CALL(*download_file, Detach());
-  item->SetIsPersisted();
   item->MaybeCompleteDownload();
   RunAllPendingInMessageLoops();
   ::testing::Mock::VerifyAndClearExpectations(download_file);
   ::testing::Mock::VerifyAndClearExpectations(mock_delegate());
 }
 
 TEST_F(DownloadItemTest, Interrupted) {
   DownloadItemImpl* item = CreateDownloadItem(DownloadItem::IN_PROGRESS);
   MockDownloadFile* download_file = AddDownloadFileToDownloadItem(item, NULL);
 
@@ skipping 110 matching lines @@
   EXPECT_EQ("livebeef", item->GetHash());
   EXPECT_EQ("", item->GetHashState());
   EXPECT_TRUE(item->AllDataSaved());
 }
 
 TEST(MockDownloadItem, Compiles) {
   MockDownloadItem mock_item;
 }
 
 }  // namespace content