Merge 8401001 r107836 into branch 912: Fix history importing by delaying DownloadManager creation.

content/browser/download/download_file_unittest.cc

 // Copyright (c) 2011 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/file_util.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/download/download_create_info.h"
 #include "content/browser/download/download_file.h"
+#include "content/browser/download/download_id.h"
+#include "content/browser/download/download_id_factory.h"
 #include "content/browser/download/download_manager.h"
 #include "content/browser/download/download_request_handle.h"
 #include "content/browser/download/download_status_updater.h"
 #include "content/browser/download/mock_download_manager.h"
 #include "content/browser/download/mock_download_manager_delegate.h"
 #include "net/base/file_stream.h"
 #include "net/base/net_errors.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+DownloadId::Domain kValidIdDomain = "valid DownloadId::Domain";
+
 class DownloadFileTest : public testing::Test {
  public:
 
   static const char* kTestData1;
   static const char* kTestData2;
   static const char* kTestData3;
   static const char* kDataHash;
   static const int32 kDummyDownloadId;
   static const int kDummyChildId;
   static const int kDummyRequestId;
 
   // We need a UI |BrowserThread| in order to destruct |download_manager_|,
   // which has trait |BrowserThread::DeleteOnUIThread|.  Without this,
   // calling Release() on |download_manager_| won't ever result in its
   // destructor being called and we get a leak.
   DownloadFileTest() :
+      id_factory_(new DownloadIdFactory(kValidIdDomain)),
       ui_thread_(BrowserThread::UI, &loop_),
       file_thread_(BrowserThread::FILE, &loop_) {
   }
 
   ~DownloadFileTest() {
   }
 
   virtual void SetUp() {
     download_manager_delegate_.reset(new MockDownloadManagerDelegate());
     download_manager_ = new MockDownloadManager(
-        download_manager_delegate_.get(), &download_status_updater_);
+        download_manager_delegate_.get(),
+        id_factory_,
+        &download_status_updater_);
   }
 
   virtual void TearDown() {
     // When a DownloadManager's reference count drops to 0, it is not
     // deleted immediately. Instead, a task is posted to the UI thread's
     // message loop to delete it.
     // So, drop the reference count to 0 and run the message loop once
     // to ensure that all resources are cleaned up before the test exits.
     download_manager_ = NULL;
     ui_thread_.message_loop()->RunAllPending();
   }
 
   virtual void CreateDownloadFile(scoped_ptr<DownloadFile>* file, int offset) {
     DownloadCreateInfo info;
-    info.download_id = kDummyDownloadId + offset;
+    info.download_id = DownloadId(kValidIdDomain, kDummyDownloadId + offset);
     // info.request_handle default constructed to null.
     info.save_info.file_stream = file_stream_;
     file->reset(new DownloadFile(&info, download_manager_));
   }
 
   virtual void DestroyDownloadFile(scoped_ptr<DownloadFile>* file, int offset) {
     EXPECT_EQ(kDummyDownloadId + offset, (*file)->id());
     EXPECT_EQ(download_manager_, (*file)->GetDownloadManager());
     EXPECT_FALSE((*file)->in_progress());
     EXPECT_EQ(static_cast<int64>(expected_data_.size()),
@@ skipping 24 matching lines @@
   scoped_ptr<MockDownloadManagerDelegate> download_manager_delegate_;
   scoped_refptr<DownloadManager> download_manager_;
 
   linked_ptr<net::FileStream> file_stream_;
 
   // DownloadFile instance we are testing.
   scoped_ptr<DownloadFile> download_file_;
 
  private:
   MessageLoop loop_;
+  scoped_refptr<DownloadIdFactory> id_factory_;
   // UI thread.
   BrowserThread ui_thread_;
   // File thread to satisfy debug checks in DownloadFile.
   BrowserThread file_thread_;
 
   // Keep track of what data should be saved to the disk file.
   std::string expected_data_;
 };
 
 const char* DownloadFileTest::kTestData1 =
@@ skipping 66 matching lines @@
   // Check the files.
   EXPECT_FALSE(file_util::PathExists(path_3));
   EXPECT_TRUE(file_util::PathExists(path_4));
 
   // Check the hash.
   EXPECT_TRUE(download_file_->GetSha256Hash(&hash));
   EXPECT_EQ(kDataHash, base::HexEncode(hash.data(), hash.size()));
 
   DestroyDownloadFile(&download_file_, 0);
 }