Created an interface for DownloadFile, for use in unit tests.

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_impl.h"
 #include "content/browser/download/download_create_info.h"
-#include "content/browser/download/download_file.h"
+#include "content/browser/download/download_file_impl.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"
@@ skipping 44 matching lines @@
     download_manager_ = NULL;
     ui_thread_.message_loop()->RunAllPending();
   }
 
   virtual void CreateDownloadFile(scoped_ptr<DownloadFile>* file, int offset) {
     DownloadCreateInfo info;
     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, new DownloadRequestHandle(),
-                         download_manager_));
+        new DownloadFileImpl(&info, new DownloadRequestHandle(),
+                             download_manager_));
   }
 
   virtual void DestroyDownloadFile(scoped_ptr<DownloadFile>* file, int offset) {
-    EXPECT_EQ(kDummyDownloadId + offset, (*file)->id());
+    EXPECT_EQ(kDummyDownloadId + offset, (*file)->Id());
     EXPECT_EQ(download_manager_, (*file)->GetDownloadManager());
-    EXPECT_FALSE((*file)->in_progress());
+    EXPECT_FALSE((*file)->InProgress());
     EXPECT_EQ(static_cast<int64>(expected_data_.size()),
-              (*file)->bytes_so_far());
+              (*file)->BytesSoFar());
 
     // Make sure the data has been properly written to disk.
     std::string disk_data;
-    EXPECT_TRUE(file_util::ReadFileToString((*file)->full_path(),
+    EXPECT_TRUE(file_util::ReadFileToString((*file)->FullPath(),
                                             &disk_data));
     EXPECT_EQ(expected_data_, disk_data);
 
     // Make sure the Browser and File threads outlive the DownloadFile
     // to satisfy thread checks inside it.
     file->reset();
   }
 
   void AppendDataToFile(scoped_ptr<DownloadFile>* file,
                         const std::string& data) {
-    EXPECT_TRUE((*file)->in_progress());
+    EXPECT_TRUE((*file)->InProgress());
     (*file)->AppendDataToFile(data.data(), data.size());
     expected_data_ += data;
     EXPECT_EQ(static_cast<int64>(expected_data_.size()),
-              (*file)->bytes_so_far());
+              (*file)->BytesSoFar());
   }
 
  protected:
   DownloadStatusUpdater download_status_updater_;
   scoped_ptr<MockDownloadManagerDelegate> download_manager_delegate_;
   scoped_refptr<DownloadManager> download_manager_;
 
   linked_ptr<net::FileStream> file_stream_;
 
   // DownloadFile instance we are testing.
@@ skipping 20 matching lines @@
 
 const int32 DownloadFileTest::kDummyDownloadId = 23;
 const int DownloadFileTest::kDummyChildId = 3;
 const int DownloadFileTest::kDummyRequestId = 67;
 
 // Rename the file before any data is downloaded, after some has, after it all
 // has, and after it's closed.
 TEST_F(DownloadFileTest, RenameFileFinal) {
   CreateDownloadFile(&download_file_, 0);
   ASSERT_EQ(net::OK, download_file_->Initialize(true));
-  FilePath initial_path(download_file_->full_path());
+  FilePath initial_path(download_file_->FullPath());
   EXPECT_TRUE(file_util::PathExists(initial_path));
   FilePath path_1(initial_path.InsertBeforeExtensionASCII("_1"));
   FilePath path_2(initial_path.InsertBeforeExtensionASCII("_2"));
   FilePath path_3(initial_path.InsertBeforeExtensionASCII("_3"));
   FilePath path_4(initial_path.InsertBeforeExtensionASCII("_4"));
 
   // Rename the file before downloading any data.
   EXPECT_EQ(net::OK, download_file_->Rename(path_1));
-  FilePath renamed_path = download_file_->full_path();
+  FilePath renamed_path = download_file_->FullPath();
   EXPECT_EQ(path_1, renamed_path);
 
   // Check the files.
   EXPECT_FALSE(file_util::PathExists(initial_path));
   EXPECT_TRUE(file_util::PathExists(path_1));
 
   // Download the data.
   AppendDataToFile(&download_file_, kTestData1);
   AppendDataToFile(&download_file_, kTestData2);
 
   // Rename the file after downloading some data.
   EXPECT_EQ(net::OK, download_file_->Rename(path_2));
-  renamed_path = download_file_->full_path();
+  renamed_path = download_file_->FullPath();
   EXPECT_EQ(path_2, renamed_path);
 
   // Check the files.
   EXPECT_FALSE(file_util::PathExists(path_1));
   EXPECT_TRUE(file_util::PathExists(path_2));
 
   AppendDataToFile(&download_file_, kTestData3);
 
   // Rename the file after downloading all the data.
   EXPECT_EQ(net::OK, download_file_->Rename(path_3));
-  renamed_path = download_file_->full_path();
+  renamed_path = download_file_->FullPath();
   EXPECT_EQ(path_3, renamed_path);
 
   // Check the files.
   EXPECT_FALSE(file_util::PathExists(path_2));
   EXPECT_TRUE(file_util::PathExists(path_3));
 
   // Should not be able to get the hash until the file is closed.
   std::string hash;
   EXPECT_FALSE(download_file_->GetSha256Hash(&hash));
 
   download_file_->Finish();
 
   // Rename the file after downloading all the data and closing the file.
   EXPECT_EQ(net::OK, download_file_->Rename(path_4));
-  renamed_path = download_file_->full_path();
+  renamed_path = download_file_->FullPath();
   EXPECT_EQ(path_4, renamed_path);
 
   // 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);
 }