| Index: chrome/browser/net/net_log_temp_file_unittest.cc
|
| diff --git a/chrome/browser/net/net_log_temp_file_unittest.cc b/chrome/browser/net/net_log_temp_file_unittest.cc
|
| index 6c414e8283c33ee5363d80682311b09cc1c7a67d..78f55d1dd7ccc58f743dbaa6b257bfcb032fad69 100644
|
| --- a/chrome/browser/net/net_log_temp_file_unittest.cc
|
| +++ b/chrome/browser/net/net_log_temp_file_unittest.cc
|
| @@ -95,8 +95,8 @@ class NetLogTempFileTest : public ::testing::Test {
|
| EXPECT_TRUE(base::PathExists(net_export_log_));
|
|
|
| int64 file_size;
|
| - // file_util::GetFileSize returns proper file size on open handles.
|
| - EXPECT_TRUE(file_util::GetFileSize(net_export_log_, &file_size));
|
| + // base::GetFileSize returns proper file size on open handles.
|
| + EXPECT_TRUE(base::GetFileSize(net_export_log_, &file_size));
|
| EXPECT_GT(file_size, 0);
|
| }
|
|
|
| @@ -221,13 +221,13 @@ TEST_F(NetLogTempFileTest, DoStartClearsFile) {
|
| VerifyFileAndStateAfterDoStart();
|
|
|
| int64 start_file_size;
|
| - EXPECT_TRUE(file_util::GetFileSize(net_export_log_, &start_file_size));
|
| + EXPECT_TRUE(base::GetFileSize(net_export_log_, &start_file_size));
|
|
|
| net_log_temp_file_->ProcessCommand(NetLogTempFile::DO_STOP);
|
| VerifyFileAndStateAfterDoStop();
|
|
|
| int64 stop_file_size;
|
| - EXPECT_TRUE(file_util::GetFileSize(net_export_log_, &stop_file_size));
|
| + EXPECT_TRUE(base::GetFileSize(net_export_log_, &stop_file_size));
|
| EXPECT_GE(stop_file_size, start_file_size);
|
|
|
| // Add some junk at the end of the file.
|
| @@ -236,7 +236,7 @@ TEST_F(NetLogTempFileTest, DoStartClearsFile) {
|
| net_export_log_, junk_data.c_str(), junk_data.size()), 0);
|
|
|
| int64 junk_file_size;
|
| - EXPECT_TRUE(file_util::GetFileSize(net_export_log_, &junk_file_size));
|
| + EXPECT_TRUE(base::GetFileSize(net_export_log_, &junk_file_size));
|
| EXPECT_GT(junk_file_size, stop_file_size);
|
|
|
| // Execute DO_START/DO_STOP commands and make sure the file is back to the
|
| @@ -245,14 +245,14 @@ TEST_F(NetLogTempFileTest, DoStartClearsFile) {
|
| VerifyFileAndStateAfterDoStart();
|
|
|
| int64 new_start_file_size;
|
| - EXPECT_TRUE(file_util::GetFileSize(net_export_log_, &new_start_file_size));
|
| + EXPECT_TRUE(base::GetFileSize(net_export_log_, &new_start_file_size));
|
| EXPECT_EQ(new_start_file_size, start_file_size);
|
|
|
| net_log_temp_file_->ProcessCommand(NetLogTempFile::DO_STOP);
|
| VerifyFileAndStateAfterDoStop();
|
|
|
| int64 new_stop_file_size;
|
| - EXPECT_TRUE(file_util::GetFileSize(net_export_log_, &new_stop_file_size));
|
| + EXPECT_TRUE(base::GetFileSize(net_export_log_, &new_stop_file_size));
|
| EXPECT_EQ(new_stop_file_size, stop_file_size);
|
| }
|
|
|
| @@ -267,7 +267,7 @@ TEST_F(NetLogTempFileTest, CheckAddEvent) {
|
| VerifyFileAndStateAfterDoStop();
|
|
|
| int64 stop_file_size;
|
| - EXPECT_TRUE(file_util::GetFileSize(net_export_log_, &stop_file_size));
|
| + EXPECT_TRUE(base::GetFileSize(net_export_log_, &stop_file_size));
|
|
|
| // Perform DO_START and add an Event and then DO_STOP and then compare
|
| // file sizes.
|
| @@ -281,6 +281,6 @@ TEST_F(NetLogTempFileTest, CheckAddEvent) {
|
| VerifyFileAndStateAfterDoStop();
|
|
|
| int64 new_stop_file_size;
|
| - EXPECT_TRUE(file_util::GetFileSize(net_export_log_, &new_stop_file_size));
|
| + EXPECT_TRUE(base::GetFileSize(net_export_log_, &new_stop_file_size));
|
| EXPECT_GE(new_stop_file_size, stop_file_size);
|
| }
|
|
|