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

Unified Diff: chrome/installer/setup/install_unittest.cc

Issue 2321573002: //chrome misc: Change ScopedTempDir::path() to GetPath() (Closed)
Patch Set: Fix Win compilation 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
Index: chrome/installer/setup/install_unittest.cc
diff --git a/chrome/installer/setup/install_unittest.cc b/chrome/installer/setup/install_unittest.cc
index 38eb4f0d43add0ed94fc9f6d227580cacf83f9a0..896225cbc6c1a83918be3d9c33d530f04b67aa7d 100644
--- a/chrome/installer/setup/install_unittest.cc
+++ b/chrome/installer/setup/install_unittest.cc
@@ -51,11 +51,11 @@ class CreateVisualElementsManifestTest : public testing::Test {
version_ = base::Version("0.0.0.0");
- version_dir_ = test_dir_.path().AppendASCII(version_.GetString());
+ version_dir_ = test_dir_.GetPath().AppendASCII(version_.GetString());
ASSERT_TRUE(base::CreateDirectory(version_dir_));
manifest_path_ =
- test_dir_.path().Append(installer::kVisualElementsManifest);
+ test_dir_.GetPath().Append(installer::kVisualElementsManifest);
}
void TearDown() override {
@@ -99,7 +99,7 @@ class InstallShortcutTest : public testing::Test {
product_.reset(new installer::Product(dist_));
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
- chrome_exe_ = temp_dir_.path().Append(installer::kChromeExe);
+ chrome_exe_ = temp_dir_.GetPath().Append(installer::kChromeExe);
EXPECT_EQ(0, base::WriteFile(chrome_exe_, "", 0));
ShellUtil::ShortcutProperties chrome_properties(ShellUtil::CURRENT_USER);
@@ -206,7 +206,7 @@ class InstallShortcutTest : public testing::Test {
for (size_t i = 0; i < num_test_cases; ++i) {
// Make sure that the target exists.
const base::FilePath target_path =
- temp_dir_.path().Append(test_cases[i].target_path);
+ temp_dir_.GetPath().Append(test_cases[i].target_path);
if (!base::PathExists(target_path)) {
ASSERT_TRUE(base::CreateDirectory(target_path.DirName()));
base::File file(target_path, base::File::FLAG_CREATE_ALWAYS |
@@ -221,7 +221,8 @@ class InstallShortcutTest : public testing::Test {
// Create the shortcut.
base::win::ShortcutProperties properties;
properties.set_target(target_path);
- properties.set_icon(temp_dir_.path().Append(test_cases[i].icon_path), 1);
+ properties.set_icon(temp_dir_.GetPath().Append(test_cases[i].icon_path),
+ 1);
ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
user_desktop_shortcut_.InsertBeforeExtension(
base::SizeTToString16(i)),
@@ -230,7 +231,7 @@ class InstallShortcutTest : public testing::Test {
// Update shortcuts.
const base::FilePath new_target_path =
- temp_dir_.path().Append(new_target_path_relative);
+ temp_dir_.GetPath().Append(new_target_path_relative);
installer::UpdatePerUserShortcutsInLocation(
ShellUtil::SHORTCUT_LOCATION_DESKTOP, dist_,
new_target_path.DirName().DirName(), new_target_path.BaseName(),
@@ -249,7 +250,7 @@ class InstallShortcutTest : public testing::Test {
GetNormalizedFilePath(target_path));
} else {
EXPECT_EQ(GetNormalizedFilePath(
- temp_dir_.path().Append(test_cases[i].target_path)),
+ temp_dir_.GetPath().Append(test_cases[i].target_path)),
GetNormalizedFilePath(target_path));
}
}
@@ -290,7 +291,7 @@ class InstallShortcutTest : public testing::Test {
// not present.
TEST_F(CreateVisualElementsManifestTest, VisualElementsManifestNotCreated) {
ASSERT_TRUE(
- installer::CreateVisualElementsManifest(test_dir_.path(), version_));
+ installer::CreateVisualElementsManifest(test_dir_.GetPath(), version_));
ASSERT_FALSE(base::PathExists(manifest_path_));
}
@@ -300,7 +301,7 @@ TEST_F(CreateVisualElementsManifestTest, VisualElementsManifestCreated) {
ASSERT_TRUE(base::CreateDirectory(
version_dir_.Append(installer::kVisualElements)));
ASSERT_TRUE(
- installer::CreateVisualElementsManifest(test_dir_.path(), version_));
+ installer::CreateVisualElementsManifest(test_dir_.GetPath(), version_));
ASSERT_TRUE(base::PathExists(manifest_path_));
std::string read_manifest;
@@ -372,7 +373,8 @@ TEST_F(InstallShortcutTest, CreateAllShortcutsButQuickLaunchShortcut) {
TEST_F(InstallShortcutTest, ReplaceAll) {
base::win::ShortcutProperties dummy_properties;
base::FilePath dummy_target;
- ASSERT_TRUE(base::CreateTemporaryFileInDir(temp_dir_.path(), &dummy_target));
+ ASSERT_TRUE(
+ base::CreateTemporaryFileInDir(temp_dir_.GetPath(), &dummy_target));
dummy_properties.set_target(dummy_target);
dummy_properties.set_working_dir(fake_user_desktop_.path());
dummy_properties.set_arguments(L"--dummy --args");
@@ -402,7 +404,8 @@ TEST_F(InstallShortcutTest, ReplaceAll) {
TEST_F(InstallShortcutTest, ReplaceExisting) {
base::win::ShortcutProperties dummy_properties;
base::FilePath dummy_target;
- ASSERT_TRUE(base::CreateTemporaryFileInDir(temp_dir_.path(), &dummy_target));
+ ASSERT_TRUE(
+ base::CreateTemporaryFileInDir(temp_dir_.GetPath(), &dummy_target));
dummy_properties.set_target(dummy_target);
dummy_properties.set_working_dir(fake_user_desktop_.path());
dummy_properties.set_arguments(L"--dummy --args");
@@ -441,7 +444,8 @@ class MigrateShortcutTest : public InstallShortcutTest,
TEST_P(MigrateShortcutTest, MigrateAwayFromDeprecatedStartMenuTest) {
base::win::ShortcutProperties dummy_properties;
base::FilePath dummy_target;
- ASSERT_TRUE(base::CreateTemporaryFileInDir(temp_dir_.path(), &dummy_target));
+ ASSERT_TRUE(
+ base::CreateTemporaryFileInDir(temp_dir_.GetPath(), &dummy_target));
dummy_properties.set_target(expected_properties_.target);
dummy_properties.set_working_dir(fake_user_desktop_.path());
dummy_properties.set_arguments(L"--dummy --args");
@@ -487,7 +491,8 @@ INSTANTIATE_TEST_CASE_P(
TEST_F(InstallShortcutTest, CreateIfNoSystemLevelAllSystemShortcutsExist) {
base::win::ShortcutProperties dummy_properties;
base::FilePath dummy_target;
- ASSERT_TRUE(base::CreateTemporaryFileInDir(temp_dir_.path(), &dummy_target));
+ ASSERT_TRUE(
+ base::CreateTemporaryFileInDir(temp_dir_.GetPath(), &dummy_target));
dummy_properties.set_target(dummy_target);
ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
@@ -523,7 +528,8 @@ TEST_F(InstallShortcutTest, CreateIfNoSystemLevelNoSystemShortcutsExist) {
TEST_F(InstallShortcutTest, CreateIfNoSystemLevelSomeSystemShortcutsExist) {
base::win::ShortcutProperties dummy_properties;
base::FilePath dummy_target;
- ASSERT_TRUE(base::CreateTemporaryFileInDir(temp_dir_.path(), &dummy_target));
+ ASSERT_TRUE(
+ base::CreateTemporaryFileInDir(temp_dir_.GetPath(), &dummy_target));
dummy_properties.set_target(dummy_target);
ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
« no previous file with comments | « chrome/installer/setup/archive_patch_helper_unittest.cc ('k') | chrome/installer/setup/setup_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698