//base: Make ScopedTempDir::path() a GetPath() with a DCHECK

base/files/file_proxy_unittest.cc

Index: base/files/file_proxy_unittest.cc
diff --git a/base/files/file_proxy_unittest.cc b/base/files/file_proxy_unittest.cc
index 2c157a54e9b98b916bcb0c56aadd8f238180895d..58632ed7e237cc851802473fdd83705d4213d7c7 100644
--- a/base/files/file_proxy_unittest.cc
+++ b/base/files/file_proxy_unittest.cc
@@ -78,9 +78,8 @@ class FileProxyTest : public testing::Test {
 
  protected:
   void CreateProxy(uint32_t flags, FileProxy* proxy) {
-    proxy->CreateOrOpen(
-        test_path(), flags,
-        Bind(&FileProxyTest::DidCreateOrOpen, weak_factory_.GetWeakPtr()));
+    proxy->CreateOrOpen(TestPath(), flags, Bind(&FileProxyTest::DidCreateOrOpen,
+                                                weak_factory_.GetWeakPtr()));
     RunLoop().Run();
     EXPECT_TRUE(proxy->IsValid());
   }
@@ -88,8 +87,8 @@ class FileProxyTest : public testing::Test {
   TaskRunner* file_task_runner() const {
     return file_thread_.task_runner().get();
   }
-  const FilePath& test_dir_path() const { return dir_.path(); }
-  const FilePath test_path() const { return dir_.path().AppendASCII("test"); }
+  const FilePath& TestDirPath() const { return dir_.GetPath(); }
+  const FilePath TestPath() const { return dir_.GetPath().AppendASCII("test"); }
 
   ScopedTempDir dir_;
   MessageLoopForIO message_loop_;
@@ -106,27 +105,25 @@ class FileProxyTest : public testing::Test {
 TEST_F(FileProxyTest, CreateOrOpen_Create) {
   FileProxy proxy(file_task_runner());
   proxy.CreateOrOpen(
-      test_path(),
-      File::FLAG_CREATE | File::FLAG_READ,
+      TestPath(), File::FLAG_CREATE | File::FLAG_READ,
       Bind(&FileProxyTest::DidCreateOrOpen, weak_factory_.GetWeakPtr()));
   RunLoop().Run();
 
   EXPECT_EQ(File::FILE_OK, error_);
   EXPECT_TRUE(proxy.IsValid());
   EXPECT_TRUE(proxy.created());
-  EXPECT_TRUE(PathExists(test_path()));
+  EXPECT_TRUE(PathExists(TestPath()));
 }
 
 TEST_F(FileProxyTest, CreateOrOpen_Open) {
   // Creates a file.
-  base::WriteFile(test_path(), NULL, 0);
-  ASSERT_TRUE(PathExists(test_path()));
+  base::WriteFile(TestPath(), NULL, 0);
+  ASSERT_TRUE(PathExists(TestPath()));
 
   // Opens the created file.
   FileProxy proxy(file_task_runner());
   proxy.CreateOrOpen(
-      test_path(),
-      File::FLAG_OPEN | File::FLAG_READ,
+      TestPath(), File::FLAG_OPEN | File::FLAG_READ,
       Bind(&FileProxyTest::DidCreateOrOpen, weak_factory_.GetWeakPtr()));
   RunLoop().Run();
 
@@ -138,14 +135,13 @@ TEST_F(FileProxyTest, CreateOrOpen_Open) {
 TEST_F(FileProxyTest, CreateOrOpen_OpenNonExistent) {
   FileProxy proxy(file_task_runner());
   proxy.CreateOrOpen(
-      test_path(),
-      File::FLAG_OPEN | File::FLAG_READ,
+      TestPath(), File::FLAG_OPEN | File::FLAG_READ,
       Bind(&FileProxyTest::DidCreateOrOpen, weak_factory_.GetWeakPtr()));
   RunLoop().Run();
   EXPECT_EQ(File::FILE_ERROR_NOT_FOUND, error_);
   EXPECT_FALSE(proxy.IsValid());
   EXPECT_FALSE(proxy.created());
-  EXPECT_FALSE(PathExists(test_path()));
+  EXPECT_FALSE(PathExists(TestPath()));
 }
 
 TEST_F(FileProxyTest, CreateOrOpen_AbandonedCreate) {
@@ -153,14 +149,13 @@ TEST_F(FileProxyTest, CreateOrOpen_AbandonedCreate) {
   {
     FileProxy proxy(file_task_runner());
     proxy.CreateOrOpen(
-        test_path(),
-        File::FLAG_CREATE | File::FLAG_READ,
+        TestPath(), File::FLAG_CREATE | File::FLAG_READ,
         Bind(&FileProxyTest::DidCreateOrOpen, weak_factory_.GetWeakPtr()));
   }
   RunLoop().Run();
   ThreadRestrictions::SetIOAllowed(prev);
 
-  EXPECT_TRUE(PathExists(test_path()));
+  EXPECT_TRUE(PathExists(TestPath()));
 }
 
 TEST_F(FileProxyTest, Close) {
@@ -170,7 +165,7 @@ TEST_F(FileProxyTest, Close) {
 
 #if defined(OS_WIN)
   // This fails on Windows if the file is not closed.
-  EXPECT_FALSE(base::Move(test_path(), test_dir_path().AppendASCII("new")));
+  EXPECT_FALSE(base::Move(TestPath(), TestDirPath().AppendASCII("new")));
 #endif
 
   proxy.Close(Bind(&FileProxyTest::DidFinish, weak_factory_.GetWeakPtr()));
@@ -179,7 +174,7 @@ TEST_F(FileProxyTest, Close) {
   EXPECT_FALSE(proxy.IsValid());
 
   // Now it should pass on all platforms.
-  EXPECT_TRUE(base::Move(test_path(), test_dir_path().AppendASCII("new")));
+  EXPECT_TRUE(base::Move(TestPath(), TestDirPath().AppendASCII("new")));
 }
 
 TEST_F(FileProxyTest, CreateTemporary) {
@@ -212,7 +207,7 @@ TEST_F(FileProxyTest, CreateTemporary) {
 }
 
 TEST_F(FileProxyTest, SetAndTake) {
-  File file(test_path(), File::FLAG_CREATE | File::FLAG_READ);
+  File file(TestPath(), File::FLAG_CREATE | File::FLAG_READ);
   ASSERT_TRUE(file.IsValid());
   FileProxy proxy(file_task_runner());
   EXPECT_FALSE(proxy.IsValid());
@@ -244,9 +239,9 @@ TEST_F(FileProxyTest, DuplicateFile) {
 
 TEST_F(FileProxyTest, GetInfo) {
   // Setup.
-  ASSERT_EQ(4, base::WriteFile(test_path(), "test", 4));
+  ASSERT_EQ(4, base::WriteFile(TestPath(), "test", 4));
   File::Info expected_info;
-  GetFileInfo(test_path(), &expected_info);
+  GetFileInfo(TestPath(), &expected_info);
 
   // Run.
   FileProxy proxy(file_task_runner());
@@ -269,7 +264,7 @@ TEST_F(FileProxyTest, Read) {
   const char expected_data[] = "bleh";
   int expected_bytes = arraysize(expected_data);
   ASSERT_EQ(expected_bytes,
-            base::WriteFile(test_path(), expected_data, expected_bytes));
+            base::WriteFile(TestPath(), expected_data, expected_bytes));
 
   // Run.
   FileProxy proxy(file_task_runner());
@@ -306,7 +301,7 @@ TEST_F(FileProxyTest, WriteAndFlush) {
 
   // Verify the written data.
   char buffer[10];
-  EXPECT_EQ(data_bytes, base::ReadFile(test_path(), buffer, data_bytes));
+  EXPECT_EQ(data_bytes, base::ReadFile(TestPath(), buffer, data_bytes));
   for (int i = 0; i < data_bytes; ++i) {
     EXPECT_EQ(data[i], buffer[i]);
   }
@@ -333,7 +328,7 @@ TEST_F(FileProxyTest, MAYBE_SetTimes) {
   EXPECT_EQ(File::FILE_OK, error_);
 
   File::Info info;
-  GetFileInfo(test_path(), &info);
+  GetFileInfo(TestPath(), &info);
 
   // The returned values may only have the seconds precision, so we cast
   // the double values to int here.
@@ -346,9 +341,9 @@ TEST_F(FileProxyTest, MAYBE_SetTimes) {
 TEST_F(FileProxyTest, SetLength_Shrink) {
   // Setup.
   const char kTestData[] = "0123456789";
-  ASSERT_EQ(10, base::WriteFile(test_path(), kTestData, 10));
+  ASSERT_EQ(10, base::WriteFile(TestPath(), kTestData, 10));
   File::Info info;
-  GetFileInfo(test_path(), &info);
+  GetFileInfo(TestPath(), &info);
   ASSERT_EQ(10, info.size);
 
   // Run.
@@ -359,11 +354,11 @@ TEST_F(FileProxyTest, SetLength_Shrink) {
   RunLoop().Run();
 
   // Verify.
-  GetFileInfo(test_path(), &info);
+  GetFileInfo(TestPath(), &info);
   ASSERT_EQ(7, info.size);
 
   char buffer[7];
-  EXPECT_EQ(7, base::ReadFile(test_path(), buffer, 7));
+  EXPECT_EQ(7, base::ReadFile(TestPath(), buffer, 7));
   int i = 0;
   for (; i < 7; ++i)
     EXPECT_EQ(kTestData[i], buffer[i]);
@@ -372,9 +367,9 @@ TEST_F(FileProxyTest, SetLength_Shrink) {
 TEST_F(FileProxyTest, SetLength_Expand) {
   // Setup.
   const char kTestData[] = "9876543210";
-  ASSERT_EQ(10, base::WriteFile(test_path(), kTestData, 10));
+  ASSERT_EQ(10, base::WriteFile(TestPath(), kTestData, 10));
   File::Info info;
-  GetFileInfo(test_path(), &info);
+  GetFileInfo(TestPath(), &info);
   ASSERT_EQ(10, info.size);
 
   // Run.
@@ -385,11 +380,11 @@ TEST_F(FileProxyTest, SetLength_Expand) {
   RunLoop().Run();
 
   // Verify.
-  GetFileInfo(test_path(), &info);
+  GetFileInfo(TestPath(), &info);
   ASSERT_EQ(53, info.size);
 
   char buffer[53];
-  EXPECT_EQ(53, base::ReadFile(test_path(), buffer, 53));
+  EXPECT_EQ(53, base::ReadFile(TestPath(), buffer, 53));
   int i = 0;
   for (; i < 10; ++i)
     EXPECT_EQ(kTestData[i], buffer[i]);