Index: chromecast/crash/linux/dummy_minidump_generator_unittest.cc |
diff --git a/chromecast/crash/linux/dummy_minidump_generator_unittest.cc b/chromecast/crash/linux/dummy_minidump_generator_unittest.cc |
index d70ea76135225e4b0df6a62c2ee3a8b0524dfb9b..567d9e2df4e8efd5a229e44e46190a42a80453df 100644 |
--- a/chromecast/crash/linux/dummy_minidump_generator_unittest.cc |
+++ b/chromecast/crash/linux/dummy_minidump_generator_unittest.cc |
@@ -5,7 +5,9 @@ |
#include <string> |
#include "base/files/file_util.h" |
+#include "base/files/scoped_temp_dir.h" |
#include "base/rand_util.h" |
+#include "chromecast/base/scoped_temp_file.h" |
#include "chromecast/crash/linux/dummy_minidump_generator.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -13,34 +15,34 @@ namespace chromecast { |
TEST(DummyMinidumpGeneratorTest, GenerateFailsWithInvalidPath) { |
// Create directory in which to put minidump. |
- base::FilePath minidump_dir; |
- ASSERT_TRUE(base::CreateNewTempDirectory("", &minidump_dir)); |
+ base::ScopedTempDir minidump_dir; |
+ ASSERT_TRUE(minidump_dir.CreateUniqueTempDir()); |
// Attempt to generate a minidump from an invalid path. |
DummyMinidumpGenerator generator("/path/does/not/exist/minidump.dmp"); |
- ASSERT_FALSE(generator.Generate(minidump_dir.Append("minidump.dmp").value())); |
+ ASSERT_FALSE( |
+ generator.Generate(minidump_dir.path().Append("minidump.dmp").value())); |
} |
TEST(DummyMinidumpGeneratorTest, GenerateSucceedsWithSmallSource) { |
// Create directory in which to put minidump. |
- base::FilePath minidump_dir; |
- ASSERT_TRUE(base::CreateNewTempDirectory("", &minidump_dir)); |
+ base::ScopedTempDir minidump_dir; |
+ ASSERT_TRUE(minidump_dir.CreateUniqueTempDir()); |
// Create a fake minidump file. |
- base::FilePath fake_minidump; |
- ASSERT_TRUE(base::CreateTemporaryFile(&fake_minidump)); |
+ ScopedTempFile fake_minidump; |
const std::string data("Test contents of the minidump file.\n"); |
ASSERT_EQ(static_cast<int>(data.size()), |
- base::WriteFile(fake_minidump, data.c_str(), data.size())); |
+ base::WriteFile(fake_minidump.path(), data.c_str(), data.size())); |
- DummyMinidumpGenerator generator(fake_minidump.value()); |
- base::FilePath new_minidump = minidump_dir.Append("minidump.dmp"); |
+ DummyMinidumpGenerator generator(fake_minidump.path().value()); |
+ base::FilePath new_minidump = minidump_dir.path().Append("minidump.dmp"); |
EXPECT_TRUE(generator.Generate(new_minidump.value())); |
// Original file should not exist, and new file should contain original |
// contents. |
std::string copied_data; |
- EXPECT_FALSE(base::PathExists(fake_minidump)); |
+ EXPECT_FALSE(base::PathExists(fake_minidump.path())); |
ASSERT_TRUE(base::PathExists(new_minidump)); |
EXPECT_TRUE(base::ReadFileToString(new_minidump, &copied_data)); |
EXPECT_EQ(data, copied_data); |
@@ -48,27 +50,26 @@ TEST(DummyMinidumpGeneratorTest, GenerateSucceedsWithSmallSource) { |
TEST(DummyMinidumpGeneratorTest, GenerateSucceedsWithLargeSource) { |
// Create directory in which to put minidump. |
- base::FilePath minidump_dir; |
- ASSERT_TRUE(base::CreateNewTempDirectory("", &minidump_dir)); |
+ base::ScopedTempDir minidump_dir; |
+ ASSERT_TRUE(minidump_dir.CreateUniqueTempDir()); |
// Create a large fake minidump file. |
- base::FilePath fake_minidump; |
- ASSERT_TRUE(base::CreateTemporaryFile(&fake_minidump)); |
+ ScopedTempFile fake_minidump; |
size_t str_len = 32768 * 10 + 1; |
const std::string data = base::RandBytesAsString(str_len); |
// Write the string to the file. |
ASSERT_EQ(static_cast<int>(data.size()), |
- base::WriteFile(fake_minidump, data.c_str(), data.size())); |
+ base::WriteFile(fake_minidump.path(), data.c_str(), data.size())); |
- base::FilePath new_minidump = minidump_dir.Append("minidump.dmp"); |
- DummyMinidumpGenerator generator(fake_minidump.value()); |
+ base::FilePath new_minidump = minidump_dir.path().Append("minidump.dmp"); |
+ DummyMinidumpGenerator generator(fake_minidump.path().value()); |
ASSERT_TRUE(generator.Generate(new_minidump.value())); |
// Original file should not exist, and new file should contain original |
// contents. |
std::string copied_data; |
- EXPECT_FALSE(base::PathExists(fake_minidump)); |
+ EXPECT_FALSE(base::PathExists(fake_minidump.path())); |
ASSERT_TRUE(base::PathExists(new_minidump)); |
EXPECT_TRUE(base::ReadFileToString(new_minidump, &copied_data)); |
EXPECT_EQ(data, copied_data); |