//chrome misc: Change ScopedTempDir::path() to GetPath()

chrome/installer/util/self_cleaning_temp_dir_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <windows.h>
 #include <stdint.h>
 #include <wincrypt.h>
 
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 53 matching lines @@
 }
 
 // Test that all intermediate dirs are cleaned up if they're empty when
 // Delete() is called.
 TEST_F(SelfCleaningTempDirTest, RemoveUnusedOnDelete) {
   // Make a directory in which we'll work.
   base::ScopedTempDir work_dir;
   EXPECT_TRUE(work_dir.CreateUniqueTempDir());
 
   // Make up some path under the temp dir.
-  base::FilePath parent_temp_dir(work_dir.path().Append(L"One").Append(L"Two"));
+  base::FilePath parent_temp_dir(
+      work_dir.GetPath().Append(L"One").Append(L"Two"));
   SelfCleaningTempDir temp_dir;
   EXPECT_TRUE(temp_dir.Initialize(parent_temp_dir, L"Three"));
   EXPECT_EQ(parent_temp_dir.Append(L"Three"), temp_dir.path());
   EXPECT_TRUE(base::DirectoryExists(temp_dir.path()));
   EXPECT_TRUE(temp_dir.Delete());
   EXPECT_FALSE(base::DirectoryExists(parent_temp_dir.Append(L"Three")));
   EXPECT_FALSE(base::DirectoryExists(parent_temp_dir));
   EXPECT_FALSE(base::DirectoryExists(parent_temp_dir.DirName()));
   EXPECT_TRUE(base::DirectoryExists(parent_temp_dir.DirName().DirName()));
   EXPECT_TRUE(work_dir.Delete());
   EXPECT_FALSE(base::DirectoryExists(parent_temp_dir.DirName().DirName()));
 }
 
 // Test that two clients can work in the same area.
 TEST_F(SelfCleaningTempDirTest, TwoClients) {
   // Make a directory in which we'll work.
   base::ScopedTempDir work_dir;
   EXPECT_TRUE(work_dir.CreateUniqueTempDir());
 
   // Make up some path under the temp dir.
-  base::FilePath parent_temp_dir(work_dir.path().Append(L"One").Append(L"Two"));
+  base::FilePath parent_temp_dir(
+      work_dir.GetPath().Append(L"One").Append(L"Two"));
   SelfCleaningTempDir temp_dir1;
   SelfCleaningTempDir temp_dir2;
   // First client is created.
   EXPECT_TRUE(temp_dir1.Initialize(parent_temp_dir, L"Three"));
   // Second client is created in the same space.
   EXPECT_TRUE(temp_dir2.Initialize(parent_temp_dir, L"Three"));
   // Both clients are where they are expected.
   EXPECT_EQ(parent_temp_dir.Append(L"Three"), temp_dir1.path());
   EXPECT_EQ(parent_temp_dir.Append(L"Three"), temp_dir2.path());
   EXPECT_TRUE(base::DirectoryExists(temp_dir1.path()));
@@ skipping 16 matching lines @@
 }
 
 // Test that all intermediate dirs are cleaned up if they're empty when the
 // destructor is called.
 TEST_F(SelfCleaningTempDirTest, RemoveUnusedOnDestroy) {
   // Make a directory in which we'll work.
   base::ScopedTempDir work_dir;
   EXPECT_TRUE(work_dir.CreateUniqueTempDir());
 
   // Make up some path under the temp dir.
-  base::FilePath parent_temp_dir(work_dir.path().Append(L"One").Append(L"Two"));
+  base::FilePath parent_temp_dir(
+      work_dir.GetPath().Append(L"One").Append(L"Two"));
   {
     SelfCleaningTempDir temp_dir;
     EXPECT_TRUE(temp_dir.Initialize(parent_temp_dir, L"Three"));
     EXPECT_EQ(parent_temp_dir.Append(L"Three"), temp_dir.path());
     EXPECT_TRUE(base::DirectoryExists(temp_dir.path()));
   }
   EXPECT_FALSE(base::DirectoryExists(parent_temp_dir.Append(L"Three")));
   EXPECT_FALSE(base::DirectoryExists(parent_temp_dir));
   EXPECT_FALSE(base::DirectoryExists(parent_temp_dir.DirName()));
   EXPECT_TRUE(base::DirectoryExists(parent_temp_dir.DirName().DirName()));
   EXPECT_TRUE(work_dir.Delete());
   EXPECT_FALSE(base::DirectoryExists(parent_temp_dir.DirName().DirName()));
 }
 
 // Test that intermediate dirs are left behind if they're not empty when the
 // destructor is called.
 TEST_F(SelfCleaningTempDirTest, LeaveUsedOnDestroy) {
   static const char kHiHon[] = "hi, hon";
 
   // Make a directory in which we'll work.
   base::ScopedTempDir work_dir;
   EXPECT_TRUE(work_dir.CreateUniqueTempDir());
 
   // Make up some path under the temp dir.
-  base::FilePath parent_temp_dir(work_dir.path().Append(L"One").Append(L"Two"));
+  base::FilePath parent_temp_dir(
+      work_dir.GetPath().Append(L"One").Append(L"Two"));
   {
     SelfCleaningTempDir temp_dir;
     EXPECT_TRUE(temp_dir.Initialize(parent_temp_dir, L"Three"));
     EXPECT_EQ(parent_temp_dir.Append(L"Three"), temp_dir.path());
     EXPECT_TRUE(base::DirectoryExists(temp_dir.path()));
     // Drop a file somewhere.
     EXPECT_EQ(static_cast<int>(arraysize(kHiHon) - 1),
               base::WriteFile(parent_temp_dir.AppendASCII(GetRandomFilename()),
                               kHiHon, arraysize(kHiHon) - 1));
   }
   EXPECT_FALSE(base::DirectoryExists(parent_temp_dir.Append(L"Three")));
   EXPECT_TRUE(base::DirectoryExists(parent_temp_dir));
   EXPECT_TRUE(work_dir.Delete());
   EXPECT_FALSE(base::DirectoryExists(parent_temp_dir.DirName().DirName()));
 }
 
 }  // namespace installer