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

chrome/installer/setup/setup_util_unittest.cc

 // Copyright (c) 2012 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 "chrome/installer/setup/setup_util_unittest.h"
 
 #include <windows.h>
 #include <shlobj.h>
 
 #include <memory>
@@ skipping 75 matching lines @@
   return false;
 }
 
 }  // namespace
 
 // Test that we are parsing Chrome version correctly.
 TEST(SetupUtilTest, GetMaxVersionFromArchiveDirTest) {
   // Create a version dir
   base::ScopedTempDir test_dir;
   ASSERT_TRUE(test_dir.CreateUniqueTempDir());
-  base::FilePath chrome_dir = test_dir.path().AppendASCII("1.0.0.0");
+  base::FilePath chrome_dir = test_dir.GetPath().AppendASCII("1.0.0.0");
   base::CreateDirectory(chrome_dir);
   ASSERT_TRUE(base::PathExists(chrome_dir));
   std::unique_ptr<base::Version> version(
-      installer::GetMaxVersionFromArchiveDir(test_dir.path()));
+      installer::GetMaxVersionFromArchiveDir(test_dir.GetPath()));
   ASSERT_EQ(version->GetString(), "1.0.0.0");
 
   base::DeleteFile(chrome_dir, true);
   ASSERT_FALSE(base::PathExists(chrome_dir)) << chrome_dir.value();
-  ASSERT_TRUE(installer::GetMaxVersionFromArchiveDir(test_dir.path()) == NULL);
+  ASSERT_TRUE(installer::GetMaxVersionFromArchiveDir(test_dir.GetPath()) ==
+              NULL);
 
-  chrome_dir = test_dir.path().AppendASCII("ABC");
+  chrome_dir = test_dir.GetPath().AppendASCII("ABC");
   base::CreateDirectory(chrome_dir);
   ASSERT_TRUE(base::PathExists(chrome_dir));
-  ASSERT_TRUE(installer::GetMaxVersionFromArchiveDir(test_dir.path()) == NULL);
+  ASSERT_TRUE(installer::GetMaxVersionFromArchiveDir(test_dir.GetPath()) ==
+              NULL);
 
-  chrome_dir = test_dir.path().AppendASCII("2.3.4.5");
+  chrome_dir = test_dir.GetPath().AppendASCII("2.3.4.5");
   base::CreateDirectory(chrome_dir);
   ASSERT_TRUE(base::PathExists(chrome_dir));
-  version.reset(installer::GetMaxVersionFromArchiveDir(test_dir.path()));
+  version.reset(installer::GetMaxVersionFromArchiveDir(test_dir.GetPath()));
   ASSERT_EQ(version->GetString(), "2.3.4.5");
 
   // Create multiple version dirs, ensure that we select the greatest.
-  chrome_dir = test_dir.path().AppendASCII("9.9.9.9");
+  chrome_dir = test_dir.GetPath().AppendASCII("9.9.9.9");
   base::CreateDirectory(chrome_dir);
   ASSERT_TRUE(base::PathExists(chrome_dir));
-  chrome_dir = test_dir.path().AppendASCII("1.1.1.1");
+  chrome_dir = test_dir.GetPath().AppendASCII("1.1.1.1");
   base::CreateDirectory(chrome_dir);
   ASSERT_TRUE(base::PathExists(chrome_dir));
 
-  version.reset(installer::GetMaxVersionFromArchiveDir(test_dir.path()));
+  version.reset(installer::GetMaxVersionFromArchiveDir(test_dir.GetPath()));
   ASSERT_EQ(version->GetString(), "9.9.9.9");
 }
 
 TEST(SetupUtilTest, DeleteFileFromTempProcess) {
   base::ScopedTempDir test_dir;
   ASSERT_TRUE(test_dir.CreateUniqueTempDir());
   base::FilePath test_file;
-  base::CreateTemporaryFileInDir(test_dir.path(), &test_file);
+  base::CreateTemporaryFileInDir(test_dir.GetPath(), &test_file);
   ASSERT_TRUE(base::PathExists(test_file));
   base::WriteFile(test_file, "foo", 3);
   EXPECT_TRUE(installer::DeleteFileFromTempProcess(test_file, 0));
   base::PlatformThread::Sleep(TestTimeouts::tiny_timeout() * 3);
   EXPECT_FALSE(base::PathExists(test_file)) << test_file.value();
 }
 
 // Note: This test is only valid when run at high integrity (i.e. it will fail
 // at medium integrity).
 TEST(SetupUtilTest, ScopedTokenPrivilegeBasic) {
@@ skipping 183 matching lines @@
     ASSERT_TRUE(
         base::CreateDirectory(GetMaxVersionArchivePath().DirName()));
     ASSERT_EQ(1, base::WriteFile(GetMaxVersionArchivePath(), "b", 1));
   }
 
   void TearDown() override {
     original_state_.reset();
   }
 
   base::FilePath GetArchivePath(const base::Version& version) const {
-    return test_dir_.path()
+    return test_dir_.GetPath()
         .AppendASCII(version.GetString())
         .Append(installer::kInstallerDir)
         .Append(installer::kChromeArchive);
   }
 
   base::FilePath GetMaxVersionArchivePath() const {
     return GetArchivePath(max_version_);
   }
 
   base::FilePath GetProductVersionArchivePath() const {
     return GetArchivePath(product_version_);
   }
 
   void InstallProduct() {
     FakeProductState* product = FakeProductState::FromProductState(
         original_state_->GetNonVersionedProductState(kSystemInstall_,
                                                      kProductType_));
 
     product->set_version(product_version_);
     base::CommandLine uninstall_command(
-        test_dir_.path()
+        test_dir_.GetPath()
             .AppendASCII(product_version_.GetString())
             .Append(installer::kInstallerDir)
             .Append(installer::kSetupExe));
     uninstall_command.AppendSwitch(installer::switches::kUninstall);
     product->set_uninstall_command(uninstall_command);
   }
 
   void UninstallProduct() {
     FakeProductState::FromProductState(
         original_state_->GetNonVersionedProductState(kSystemInstall_,
@@ skipping 273 matching lines @@
   }
 
   // Ensure that all values are absent.
   {
     base::win::RegistryValueIterator it(root_, path_.c_str());
     ASSERT_EQ(0u, it.ValueCount());
   }
 }
 
 }  // namespace installer