Added member data to classes to support download resumption.

content/browser/download/base_file_unittest.cc

Index: content/browser/download/base_file_unittest.cc
diff --git a/content/browser/download/base_file_unittest.cc b/content/browser/download/base_file_unittest.cc
index 6d6edc74e1d6efb113358ba0c520ff1c8056ddf8..a41e5196c5c43553e867a107abf2e0d8f157382c 100644
--- a/content/browser/download/base_file_unittest.cc
+++ b/content/browser/download/base_file_unittest.cc
@@ -44,7 +44,7 @@ class BaseFileTest : public testing::Test {
   virtual void SetUp() {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     base_file_.reset(
-        new BaseFile(FilePath(), GURL(), GURL(), 0, file_stream_));
+        new BaseFile(FilePath(), GURL(), GURL(), 0, "", file_stream_));
   }
 
   virtual void TearDown() {
@@ -118,7 +118,7 @@ class BaseFileTest : public testing::Test {
   static FilePath CreateTestFile() {
     FilePath file_name;
     linked_ptr<net::FileStream> dummy_file_stream;
-    BaseFile file(FilePath(), GURL(), GURL(), 0, dummy_file_stream);
+    BaseFile file(FilePath(), GURL(), GURL(), 0, "", dummy_file_stream);
 
     EXPECT_EQ(net::OK, file.Initialize(false));
     file_name = file.full_path();
@@ -136,7 +136,8 @@ class BaseFileTest : public testing::Test {
   static void CreateFileWithName(const FilePath& file_name) {
     EXPECT_NE(FilePath::StringType(), file_name.value());
     linked_ptr<net::FileStream> dummy_file_stream;
-    BaseFile duplicate_file(file_name, GURL(), GURL(), 0, dummy_file_stream);
+    BaseFile duplicate_file(
+        file_name, GURL(), GURL(), 0, "", dummy_file_stream);
     EXPECT_EQ(net::OK, duplicate_file.Initialize(false));
     // Write something into it.
     duplicate_file.AppendDataToFile(kTestData4, kTestDataLength4);
@@ -251,8 +252,12 @@ TEST_F(BaseFileTest, MultipleWrites) {
 
 // Write data to the file once and calculate its sha256 hash.
 TEST_F(BaseFileTest, SingleWriteWithHash) {

[Randy Smith (Not in Mondays), 2011/11/16 21:40:25]

I'd think that we'd also want to confirm that if we have a data chunk X, and we
write it to a file and get a hash, that hash is the same as if we wrote X/2,
closed the file, opened a new one with the partial hash, and did the second
half.

[ahendrickson, 2011/11/19 20:18:04]

That sounds like a good idea.

Done.

+  std::string partial_hash;
   ASSERT_EQ(net::OK, base_file_->Initialize(true));
+  // Can get partial hashes before Finish() is called.
+  EXPECT_TRUE(base_file_->GetSha256Hash(&partial_hash));
   ASSERT_EQ(net::OK, AppendDataToFile(kTestData1));
+  EXPECT_TRUE(base_file_->GetSha256Hash(&partial_hash));
   base_file_->Finish();
 
   std::string hash;
@@ -269,8 +274,6 @@ TEST_F(BaseFileTest, MultipleWritesWithHash) {
   ASSERT_EQ(net::OK, AppendDataToFile(kTestData1));
   ASSERT_EQ(net::OK, AppendDataToFile(kTestData2));
   ASSERT_EQ(net::OK, AppendDataToFile(kTestData3));
-  // no hash before Finish() is called either.
-  EXPECT_FALSE(base_file_->GetSha256Hash(&hash));
   base_file_->Finish();
 
   EXPECT_TRUE(base_file_->GetSha256Hash(&hash));
@@ -321,7 +324,7 @@ TEST_F(BaseFileTest, RenameWhileInProgress) {
 TEST_F(BaseFileTest, MultipleWritesWithError) {
   ASSERT_TRUE(OpenMockFileStream());
   base_file_.reset(new BaseFile(mock_file_stream_->get_path(),
-                                GURL(), GURL(), 0, mock_file_stream_));
+                                GURL(), GURL(), 0, "", mock_file_stream_));
   EXPECT_EQ(net::OK, base_file_->Initialize(false));
   ASSERT_EQ(net::OK, AppendDataToFile(kTestData1));
   ASSERT_EQ(net::OK, AppendDataToFile(kTestData2));
@@ -361,7 +364,7 @@ TEST_F(BaseFileTest, AppendToBaseFile) {
   // Use the file we've just created.
   base_file_.reset(
       new BaseFile(existing_file_name, GURL(), GURL(), kTestDataLength4,
-                   file_stream_));
+                   "", file_stream_));
 
   EXPECT_EQ(net::OK, base_file_->Initialize(false));
 
@@ -386,7 +389,7 @@ TEST_F(BaseFileTest, ReadonlyBaseFile) {
 
   // Try to overwrite it.
   base_file_.reset(
-      new BaseFile(readonly_file_name, GURL(), GURL(), 0, file_stream_));
+      new BaseFile(readonly_file_name, GURL(), GURL(), 0, "", file_stream_));
 
   expect_in_progress_ = false;