diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-07 22:57:11 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-07 22:57:11 +0000 |
| commit | 92be8eb69a70860ef270e598dac0c11cb1b4dac4 (patch) | |
| tree | a2a64311b75b91daddd89cd2c2236c5651b2cb94 /net | |
| parent | 5cc45528290be46f831148d0fcb75ce971dae476 (diff) | |
| download | chromium_src-92be8eb69a70860ef270e598dac0c11cb1b4dac4.zip chromium_src-92be8eb69a70860ef270e598dac0c11cb1b4dac4.tar.gz chromium_src-92be8eb69a70860ef270e598dac0c11cb1b4dac4.tar.bz2 | |
Move the rest of test_file_util to base namespace.
R=rvargas@chromium.org
Review URL: https://codereview.chromium.org/444163003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288158 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/file_stream_unittest.cc | 2 | ||||
| -rw-r--r-- | net/http/http_network_transaction_unittest.cc | 2 | ||||
| -rw-r--r-- | net/spdy/spdy_network_transaction_unittest.cc | 2 | ||||
| -rw-r--r-- | net/test/run_all_unittests.cc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/net/base/file_stream_unittest.cc b/net/base/file_stream_unittest.cc index 78ed2d5..2e308b3 100644 --- a/net/base/file_stream_unittest.cc +++ b/net/base/file_stream_unittest.cc @@ -845,7 +845,7 @@ TEST_F(FileStreamTest, ContentUriRead) { // Insert the image into MediaStore. MediaStore will do some conversions, and // return the content URI. - base::FilePath path = file_util::InsertImageIntoMediaStore(image_file); + base::FilePath path = base::InsertImageIntoMediaStore(image_file); EXPECT_TRUE(path.IsContentUri()); EXPECT_TRUE(base::PathExists(path)); int64 file_size; diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc index 9c4568a..f56b6e2 100644 --- a/net/http/http_network_transaction_unittest.cc +++ b/net/http/http_network_transaction_unittest.cc @@ -8150,7 +8150,7 @@ TEST_P(HttpNetworkTransactionTest, UploadUnreadableFile) { std::string temp_file_content("Unreadable file."); ASSERT_TRUE(base::WriteFile(temp_file, temp_file_content.c_str(), temp_file_content.length())); - ASSERT_TRUE(file_util::MakeFileUnreadable(temp_file)); + ASSERT_TRUE(base::MakeFileUnreadable(temp_file)); ScopedVector<UploadElementReader> element_readers; element_readers.push_back( diff --git a/net/spdy/spdy_network_transaction_unittest.cc b/net/spdy/spdy_network_transaction_unittest.cc index 0e9e64c..7d301d1 100644 --- a/net/spdy/spdy_network_transaction_unittest.cc +++ b/net/spdy/spdy_network_transaction_unittest.cc @@ -499,7 +499,7 @@ class SpdyNetworkTransactionTest CHECK(base::CreateTemporaryFileInDir(temp_dir_.path(), &file_path)); CHECK_EQ(static_cast<int>(kUploadDataSize), base::WriteFile(file_path, kUploadData, kUploadDataSize)); - CHECK(file_util::MakeFileUnreadable(file_path)); + CHECK(base::MakeFileUnreadable(file_path)); ScopedVector<UploadElementReader> element_readers; element_readers.push_back( diff --git a/net/test/run_all_unittests.cc b/net/test/run_all_unittests.cc index 96e8a3c..a035057 100644 --- a/net/test/run_all_unittests.cc +++ b/net/test/run_all_unittests.cc @@ -33,7 +33,7 @@ int main(int argc, char** argv) { #if defined(OS_ANDROID) const base::android::RegistrationMethod kNetTestRegisteredMethods[] = { {"NetAndroid", net::android::RegisterJni}, - {"TestFileUtil", file_util::RegisterContentUriTestUtils}, + {"TestFileUtil", base::RegisterContentUriTestUtils}, {"UrlAndroid", url::android::RegisterJni}, }; |