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

Unified Diff: chrome/installer/util/install_util_unittest.cc

Issue 2476573004: Use InstallDetails in installer_util. (Closed)
Patch Set: sync to position 451835 Created 3 years, 10 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
« no previous file with comments | « chrome/installer/util/install_util.cc ('k') | chrome/installer/util/run_all_unittests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/install_util_unittest.cc
diff --git a/chrome/installer/util/install_util_unittest.cc b/chrome/installer/util/install_util_unittest.cc
index ad1fbff7a30d68c8e11d5e8d01193c588f410421..e52324ae2d0b0715d0a08c5d88a0ad7bf8803938 100644
--- a/chrome/installer/util/install_util_unittest.cc
+++ b/chrome/installer/util/install_util_unittest.cc
@@ -369,39 +369,6 @@ TEST_F(InstallUtilTest, ProgramCompare) {
L"\"" + short_expect + L"\""));
}
-// Win64 Chrome is always installed in the 32-bit Program Files directory. Test
-// that IsPerUserInstall returns false for an arbitrary path with
-// DIR_PROGRAM_FILESX86 as a suffix but not DIR_PROGRAM_FILES when the two are
-// unrelated.
-TEST_F(InstallUtilTest, IsPerUserInstall) {
- InstallUtil::ResetIsPerUserInstallForTest();
-
-#if defined(_WIN64)
- const int kChromeProgramFilesKey = base::DIR_PROGRAM_FILESX86;
-#else
- const int kChromeProgramFilesKey = base::DIR_PROGRAM_FILES;
-#endif
- base::ScopedPathOverride program_files_override(kChromeProgramFilesKey);
- base::FilePath some_exe;
- ASSERT_TRUE(PathService::Get(kChromeProgramFilesKey, &some_exe));
- some_exe = some_exe.AppendASCII("Company")
- .AppendASCII("Product")
- .AppendASCII("product.exe");
- EXPECT_FALSE(InstallUtil::IsPerUserInstall(some_exe));
- InstallUtil::ResetIsPerUserInstallForTest();
-
-#if defined(_WIN64)
- const int kOtherProgramFilesKey = base::DIR_PROGRAM_FILES;
- base::ScopedPathOverride other_program_files_override(kOtherProgramFilesKey);
- ASSERT_TRUE(PathService::Get(kOtherProgramFilesKey, &some_exe));
- some_exe = some_exe.AppendASCII("Company")
- .AppendASCII("Product")
- .AppendASCII("product.exe");
- EXPECT_TRUE(InstallUtil::IsPerUserInstall(some_exe));
- InstallUtil::ResetIsPerUserInstallForTest();
-#endif // defined(_WIN64)
-}
-
TEST_F(InstallUtilTest, AddDowngradeVersion) {
TestBrowserDistribution dist;
bool system_install = true;
« no previous file with comments | « chrome/installer/util/install_util.cc ('k') | chrome/installer/util/run_all_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698