Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(722)

Unified Diff: third_party/zlib/google/zip_unittest.cc

Issue 2317123003: misc files R-U: Change ScopedTempDir::path() to GetPath() (Closed)
Patch Set: Just rebased Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/zlib/google/zip_reader_unittest.cc ('k') | tools/gn/exec_process_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/zlib/google/zip_unittest.cc
diff --git a/third_party/zlib/google/zip_unittest.cc b/third_party/zlib/google/zip_unittest.cc
index 3a6eedfd2c7569fdb165319bd9fc51c0aec5d2c4..2d969d7d91f417c9c7c1f2d4463fc1ca450c7360 100644
--- a/third_party/zlib/google/zip_unittest.cc
+++ b/third_party/zlib/google/zip_unittest.cc
@@ -37,7 +37,7 @@ class ZipTest : public PlatformTest {
PlatformTest::SetUp();
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
- test_dir_ = temp_dir_.path();
+ test_dir_ = temp_dir_.GetPath();
base::FilePath zip_path(test_dir_);
zip_contents_.insert(zip_path.AppendASCII("foo.txt"));
@@ -122,9 +122,9 @@ class ZipTest : public PlatformTest {
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
- base::FilePath zip_file = temp_dir.path().AppendASCII("out.zip");
- base::FilePath src_dir = temp_dir.path().AppendASCII("input");
- base::FilePath out_dir = temp_dir.path().AppendASCII("output");
+ base::FilePath zip_file = temp_dir.GetPath().AppendASCII("out.zip");
+ base::FilePath src_dir = temp_dir.GetPath().AppendASCII("input");
+ base::FilePath out_dir = temp_dir.GetPath().AppendASCII("output");
base::FilePath src_file = src_dir.AppendASCII("test.txt");
base::FilePath out_file = out_dir.AppendASCII("test.txt");
@@ -220,7 +220,7 @@ TEST_F(ZipTest, Zip) {
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
- base::FilePath zip_file = temp_dir.path().AppendASCII("out.zip");
+ base::FilePath zip_file = temp_dir.GetPath().AppendASCII("out.zip");
EXPECT_TRUE(zip::Zip(src_dir, zip_file, true));
TestUnzipFile(zip_file, true);
@@ -233,7 +233,7 @@ TEST_F(ZipTest, ZipIgnoreHidden) {
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
- base::FilePath zip_file = temp_dir.path().AppendASCII("out.zip");
+ base::FilePath zip_file = temp_dir.GetPath().AppendASCII("out.zip");
EXPECT_TRUE(zip::Zip(src_dir, zip_file, false));
TestUnzipFile(zip_file, false);
@@ -247,11 +247,10 @@ TEST_F(ZipTest, ZipNonASCIIDir) {
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
// Append 'Тест' (in cyrillic).
- base::FilePath src_dir_russian =
- temp_dir.path().Append(base::FilePath::FromUTF8Unsafe(
- "\xD0\xA2\xD0\xB5\xD1\x81\xD1\x82"));
+ base::FilePath src_dir_russian = temp_dir.GetPath().Append(
+ base::FilePath::FromUTF8Unsafe("\xD0\xA2\xD0\xB5\xD1\x81\xD1\x82"));
base::CopyDirectory(src_dir, src_dir_russian, true);
- base::FilePath zip_file = temp_dir.path().AppendASCII("out_russian.zip");
+ base::FilePath zip_file = temp_dir.GetPath().AppendASCII("out_russian.zip");
EXPECT_TRUE(zip::Zip(src_dir_russian, zip_file, true));
TestUnzipFile(zip_file, true);
@@ -287,7 +286,7 @@ TEST_F(ZipTest, ZipFiles) {
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
- base::FilePath zip_name = temp_dir.path().AppendASCII("out.zip");
+ base::FilePath zip_name = temp_dir.GetPath().AppendASCII("out.zip");
base::File zip_file(zip_name,
base::File::FLAG_CREATE | base::File::FLAG_WRITE);
@@ -321,7 +320,7 @@ TEST_F(ZipTest, UnzipFilesWithIncorrectSize) {
base::ScopedTempDir scoped_temp_dir;
ASSERT_TRUE(scoped_temp_dir.CreateUniqueTempDir());
- const base::FilePath& temp_dir = scoped_temp_dir.path();
+ const base::FilePath& temp_dir = scoped_temp_dir.GetPath();
ASSERT_TRUE(zip::Unzip(test_zip_file, temp_dir));
EXPECT_TRUE(base::DirectoryExists(temp_dir.AppendASCII("d")));
« no previous file with comments | « third_party/zlib/google/zip_reader_unittest.cc ('k') | tools/gn/exec_process_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698