Download filename determination refactor (3/3)

content/browser/download/download_manager_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 <set>
 #include <string>
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 42 matching lines @@
 namespace {
 
 class MockDownloadManagerDelegate : public content::DownloadManagerDelegate {
  public:
   MockDownloadManagerDelegate();
   virtual ~MockDownloadManagerDelegate();
 
   MOCK_METHOD0(Shutdown, void());
   MOCK_METHOD0(GetNextId, content::DownloadId());
   MOCK_METHOD1(ShouldStartDownload, bool(int32));
-  MOCK_METHOD1(ChooseDownloadPath, void(DownloadItem*));
   MOCK_METHOD1(GetIntermediatePath, FilePath(const DownloadItem&));
   MOCK_METHOD0(GetAlternativeWebContentsToNotifyForDownload, WebContents*());
   MOCK_METHOD1(ShouldOpenFileBasedOnExtension, bool(const FilePath&));
   MOCK_METHOD2(ShouldCompleteDownload, bool(
       DownloadItem*, const base::Closure&));
   MOCK_METHOD1(ShouldOpenDownload, bool(DownloadItem*));
   MOCK_METHOD0(GenerateFileHash, bool());
   MOCK_METHOD1(AddItemToPersistentStore, void(DownloadItem*));
   MOCK_METHOD1(UpdateItemInPersistentStore, void(DownloadItem*));
   MOCK_METHOD2(UpdatePathForItemInPersistentStore,
@@ skipping 375 matching lines @@
   EXPECT_CALL(GetMockDownloadManagerDelegate(), GenerateFileHash())
       .WillOnce(Return(true));
   EXPECT_CALL(GetMockDownloadFileManager(), MockCreateDownloadFile(
       info.get(), static_cast<content::ByteStreamReader*>(NULL),
       download_manager_.get(), true, _, _));
 
   download_manager_->StartDownload(info.Pass(), stream.Pass());
   EXPECT_TRUE(GetActiveDownloadItem(local_id));
 }
 
-// Does the DownloadManager prompt when requested?
-TEST_F(DownloadManagerTest, RestartDownload) {
-  // Put a mock we have a handle to on the download manager.
-  content::MockDownloadItem& item(AddItemToManager());
-  int download_id = item.GetId();
-
-  // Confirm we're internally consistent.
-  EXPECT_EQ(&item, GetActiveDownloadItem(download_id));
-
-  ScopedTempDir download_dir;
-  ASSERT_TRUE(download_dir.CreateUniqueTempDir());
-  FilePath expected_path(download_dir.path().Append(
-      FILE_PATH_LITERAL("location")));
-
-  EXPECT_CALL(item, GetTargetDisposition())
-      .WillOnce(Return(DownloadItem::TARGET_DISPOSITION_PROMPT));
-  EXPECT_CALL(GetMockDownloadManagerDelegate(), ChooseDownloadPath(&item));
-  download_manager_->RestartDownload(download_id);
-
-  // The alternative pathway goes straight to OnTargetPathAvailable,
-  // so it more naturally belongs below.
-}
-
 // Do the results of GetIntermediatePath get passed through to the
 // download?  Note that this path is tested from RestartDownload
 // to test the non-prompting path in RestartDownload as well.
 TEST_F(DownloadManagerTest, OnTargetPathAvailable) {
   // Put a mock we have a handle to on the download manager.
   content::MockDownloadItem& item(AddItemToManager());
 
   ScopedTempDir download_dir;
   ASSERT_TRUE(download_dir.CreateUniqueTempDir());
   FilePath target_path(download_dir.path().Append(
       FILE_PATH_LITERAL("location")));
   FilePath intermediate_path(download_dir.path().Append(
       FILE_PATH_LITERAL("location.crdownload")));
 
-  EXPECT_CALL(item, GetTargetDisposition())
-      .WillOnce(Return(DownloadItem::TARGET_DISPOSITION_OVERWRITE));
   EXPECT_CALL(GetMockDownloadManagerDelegate(),
               GetIntermediatePath(Ref(item)))
       .WillOnce(Return(intermediate_path));
   // Finesse DCHECK with WillRepeatedly.
   EXPECT_CALL(item, GetTargetFilePath())
       .WillRepeatedly(ReturnRef(target_path));
   EXPECT_CALL(item, OnIntermediatePathDetermined(
       &GetMockDownloadFileManager(), intermediate_path));
   download_manager_->RestartDownload(item.GetId());
 }
@@ skipping 53 matching lines @@
               UpdateItemInPersistentStore(&item));
   EXPECT_CALL(item, GetState())
       .WillRepeatedly(Return(DownloadItem::CANCELLED));
   EXPECT_CALL(item, GetDbHandle())
       .WillRepeatedly(Return(db_handle));
 
   EXPECT_CALL(item, OffThreadCancel(&GetMockDownloadFileManager()));
   download_manager_->DownloadStopped(&item);
   EXPECT_EQ(NULL, GetActiveDownloadItem(download_id));
 }