Shift "commit point" for when a download will no longer accept cancels.

content/browser/download/download_file_manager_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 "content/browser/download/download_file_manager.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string_number_conversions.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/download/byte_stream.h"
 #include "content/browser/download/download_create_info.h"
 #include "content/browser/download/download_interrupt_reasons_impl.h"
+#include "content/browser/download/download_file_factory.h"
 #include "content/browser/download/download_request_handle.h"
 #include "content/browser/download/mock_download_file.h"
 #include "content/public/browser/download_id.h"
 #include "content/public/test/mock_download_manager.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
@@ skipping 15 matching lines @@
 class TestDownloadManager : public MockDownloadManager {
  public:
   MOCK_METHOD3(OnDownloadRenamed,
                void(int download_id,
                     content::DownloadInterruptReason reason,
                     const FilePath& full_path));
  private:
   ~TestDownloadManager() {}
 };
 
-class MockDownloadFileFactory :
-    public DownloadFileManager::DownloadFileFactory {
+class MockDownloadFileFactory : public content::DownloadFileFactory {
 
  public:
   MockDownloadFileFactory() {}
   virtual ~MockDownloadFileFactory() {}
 
   virtual content::DownloadFile* CreateFile(
       DownloadCreateInfo* info,
       scoped_ptr<content::ByteStreamReader> stream,
       content::DownloadManager* download_manager,
       bool calculate_hash,
@@ skipping 114 matching lines @@
     Mock::VerifyAndClearExpectations(file);
     Mock::VerifyAndClearExpectations(download_manager_);
   }
 
   void OnDownloadFileCreated(content::DownloadInterruptReason reason) {
     last_reason_ = reason;
   }
 
   // Create a download item on the DFM.
   // |info| is the information needed to create a new download file.
   // |id| is the download ID of the new download file.

[asanka, 2012/09/20 18:42:15]

Nit: No |id| parameter anymore.

[Randy Smith (Not in Mondays), 2012/09/21 21:58:01]

Done.

   void CreateDownloadFile(scoped_ptr<DownloadCreateInfo> info) {
+    // Anything that isn't DOWNLOAD_INTERRUPT_REASON_NONE.
+    last_reason_ = content::DOWNLOAD_INTERRUPT_REASON_FILE_ACCESS_DENIED;
+
     // Mostly null out args; they'll be passed to MockDownloadFileFactory
     // to be ignored anyway.
     download_file_manager_->CreateDownloadFile(
         info.Pass(), scoped_ptr<content::ByteStreamReader>(),
         download_manager_, true, net::BoundNetLog(),
         base::Bind(&DownloadFileManagerTest::OnDownloadFileCreated,
                    // The test jig will outlive all download files.
                    base::Unretained(this)));
 
-    // Anything that isn't DOWNLOAD_INTERRUPT_REASON_NONE.
-    last_reason_ = content::DOWNLOAD_INTERRUPT_REASON_FILE_ACCESS_DENIED;
     ProcessAllPendingMessages();
     EXPECT_EQ(content::DOWNLOAD_INTERRUPT_REASON_NONE, last_reason_);
   }
 
   // Renames the download file.
   // |id|           is the download ID of the download file.
   // |new_path|     is the new file path.
   // |unique_path|  is the actual path that the download file will be
   //                renamed to. If there is an existing file at
   //                |new_path| and |replace| is false, then |new_path|
@@ skipping 22 matching lines @@
 
     EXPECT_TRUE(rename_callback.Equals(passed_callback));
   }
 
   void Complete(DownloadId id) {
     MockDownloadFile* file = download_file_factory_->GetExistingFile(id);
     ASSERT_TRUE(file != NULL);
 
     EXPECT_CALL(*file, AnnotateWithSourceInformation())
         .WillOnce(Return());
-    EXPECT_CALL(*file, Detach())
+    EXPECT_CALL(*file, Detach(_))
         .WillOnce(Return());
     int num_downloads = download_file_manager_->NumberOfActiveDownloads();
     EXPECT_LT(0, num_downloads);
     download_file_manager_->CompleteDownload(id, base::Bind(NullCallback));
     EXPECT_EQ(num_downloads - 1,
               download_file_manager_->NumberOfActiveDownloads());
     EXPECT_EQ(NULL, download_file_manager_->GetDownloadFile(id));
   }
 
   void CleanUp(DownloadId id) {
@@ skipping 151 matching lines @@
 
   CleanUp(dummy_id);
 }
 
 // TODO(ahendrickson) -- A test for download manager shutdown.
 // Expected call sequence:
 //  OnDownloadManagerShutdown
 //    DownloadFile::GetDownloadManager
 //    DownloadFile::CancelDownloadRequest
 //    DownloadFile::~DownloadFile