summaryrefslogtreecommitdiffstats
path: root/content/browser/download/base_file_unittest.cc
diff options
context:
space:
mode:
authorahendrickson@chromium.org <ahendrickson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-05 06:46:26 +0000
committerahendrickson@chromium.org <ahendrickson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-05 06:46:26 +0000
commitac5e81005177ac0118b6f289f91e7919a642bc29 (patch)
tree3a08199af7aff8be0c27eaef04ae52c29a88024c /content/browser/download/base_file_unittest.cc
parentef5672efb64bbfa3e942a43ef9784f580313b062 (diff)
downloadchromium_src-ac5e81005177ac0118b6f289f91e7919a642bc29.zip
chromium_src-ac5e81005177ac0118b6f289f91e7919a642bc29.tar.gz
chromium_src-ac5e81005177ac0118b6f289f91e7919a642bc29.tar.bz2
Added net logging to BaseFile.
This enables net logging for BaseFile if any customer of BaseFile choose to take advantage of it -- none yet do. This is the second of 4 CLs that will enable net logging for downloads. BUG=None TEST=None Review URL: http://codereview.chromium.org/9223019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120510 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/download/base_file_unittest.cc')
-rw-r--r--content/browser/download/base_file_unittest.cc51
1 files changed, 40 insertions, 11 deletions
diff --git a/content/browser/download/base_file_unittest.cc b/content/browser/download/base_file_unittest.cc
index 646ef00..2ed3b9d 100644
--- a/content/browser/download/base_file_unittest.cc
+++ b/content/browser/download/base_file_unittest.cc
@@ -51,8 +51,14 @@ class BaseFileTest : public testing::Test {
virtual void SetUp() {
ResetHash();
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
- base_file_.reset(
- new BaseFile(FilePath(), GURL(), GURL(), 0, false, "", file_stream_));
+ base_file_.reset(new BaseFile(FilePath(),
+ GURL(),
+ GURL(),
+ 0,
+ false,
+ "",
+ file_stream_,
+ net::BoundNetLog()));
}
virtual void TearDown() {
@@ -96,8 +102,14 @@ class BaseFileTest : public testing::Test {
}
void MakeFileWithHash() {
- base_file_.reset(
- new BaseFile(FilePath(), GURL(), GURL(), 0, true, "", file_stream_));
+ base_file_.reset(new BaseFile(FilePath(),
+ GURL(),
+ GURL(),
+ 0,
+ true,
+ "",
+ file_stream_,
+ net::BoundNetLog()));
}
bool OpenMockFileStream() {
@@ -148,7 +160,14 @@ class BaseFileTest : public testing::Test {
static FilePath CreateTestFile() {
FilePath file_name;
linked_ptr<net::FileStream> dummy_file_stream;
- BaseFile file(FilePath(), GURL(), GURL(), 0, false, "", dummy_file_stream);
+ BaseFile file(FilePath(),
+ GURL(),
+ GURL(),
+ 0,
+ false,
+ "",
+ dummy_file_stream,
+ net::BoundNetLog());
EXPECT_EQ(net::OK, file.Initialize());
file_name = file.full_path();
@@ -166,8 +185,14 @@ 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, false, "", dummy_file_stream);
+ BaseFile duplicate_file(file_name,
+ GURL(),
+ GURL(),
+ 0,
+ false,
+ "",
+ dummy_file_stream,
+ net::BoundNetLog());
EXPECT_EQ(net::OK, duplicate_file.Initialize());
// Write something into it.
duplicate_file.AppendDataToFile(kTestData4, kTestDataLength4);
@@ -387,7 +412,8 @@ TEST_F(BaseFileTest, MultipleWritesInterruptedWithHash) {
base_file_->bytes_so_far(),
true,
hash_state,
- second_stream);
+ second_stream,
+ net::BoundNetLog());
ASSERT_EQ(net::OK, second_file.Initialize());
std::string data(kTestData3);
EXPECT_EQ(net::OK, second_file.AppendDataToFile(data.data(), data.size()));
@@ -448,7 +474,8 @@ TEST_F(BaseFileTest, MultipleWritesWithError) {
0,
false,
"",
- mock_file_stream_));
+ mock_file_stream_,
+ net::BoundNetLog()));
EXPECT_EQ(net::OK, base_file_->Initialize());
ASSERT_EQ(net::OK, AppendDataToFile(kTestData1));
ASSERT_EQ(net::OK, AppendDataToFile(kTestData2));
@@ -492,7 +519,8 @@ TEST_F(BaseFileTest, AppendToBaseFile) {
kTestDataLength4,
false,
"",
- file_stream_));
+ file_stream_,
+ net::BoundNetLog()));
EXPECT_EQ(net::OK, base_file_->Initialize());
@@ -522,7 +550,8 @@ TEST_F(BaseFileTest, ReadonlyBaseFile) {
0,
false,
"",
- file_stream_));
+ file_stream_,
+ net::BoundNetLog()));
expect_in_progress_ = false;