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

Unified Diff: chrome/test/mini_installer_test/chrome_mini_installer.cc

Issue 271099: Re-try r29078: Remove some deprecated file_util wstring functions. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 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/shell_util.cc ('k') | chrome/test/mini_installer_test/mini_installer_test_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/mini_installer_test/chrome_mini_installer.cc
===================================================================
--- chrome/test/mini_installer_test/chrome_mini_installer.cc (revision 29088)
+++ chrome/test/mini_installer_test/chrome_mini_installer.cc (working copy)
@@ -112,7 +112,7 @@
printf("\nChrome will be installed at %ls level\n", install_type_.c_str());
printf("\nWill proceed with the test only if this path exists: %ls\n\n",
path.c_str());
- ASSERT_TRUE(file_util::PathExists(path));
+ ASSERT_TRUE(file_util::PathExists(FilePath::FromWStringHack(path)));
LaunchInstaller(path, exe_name.c_str());
BrowserDistribution* dist = BrowserDistribution::GetDistribution();
ASSERT_TRUE(CheckRegistryKey(dist->GetVersionKey()));
@@ -230,7 +230,7 @@
CleanChromeInstall();
return;
}
- ASSERT_TRUE(file_util::PathExists(uninstall_path));
+ ASSERT_TRUE(file_util::PathExists(FilePath::FromWStringHack(uninstall_path)));
std::wstring uninstall_args = L"\"" + uninstall_path +
L"\"" + L" --uninstall --force-uninstall";
if (install_type_ == mini_installer_constants::kSystemInstall)
@@ -403,15 +403,16 @@
path = GetStartMenuShortcutPath();
file_util::AppendToPath(&path, mini_installer_constants::kChromeBuildType);
// Verify if path exists.
- if (file_util::PathExists(path)) {
+ if (file_util::PathExists(FilePath::FromWStringHack(path))) {
return_val = true;
uninstall_lnk = path;
file_util::AppendToPath(&path,
mini_installer_constants::kChromeLaunchShortcut);
file_util::AppendToPath(&uninstall_lnk,
mini_installer_constants::kChromeUninstallShortcut);
- ASSERT_TRUE(file_util::PathExists(path));
- ASSERT_TRUE(file_util::PathExists(uninstall_lnk));
+ ASSERT_TRUE(file_util::PathExists(FilePath::FromWStringHack(path)));
+ ASSERT_TRUE(file_util::PathExists(
+ FilePath::FromWStringHack(uninstall_lnk)));
}
if (return_val)
printf("Chrome shortcuts found are:\n%ls\n%ls\n\n",
@@ -452,7 +453,7 @@
file_util::AppendToPath(&path, installer_util::kInstallerDir);
file_util::AppendToPath(&path,
mini_installer_constants::kChromeSetupExecutable);
- if (!file_util::PathExists(path)) {
+ if (!file_util::PathExists(FilePath::FromWStringHack(path))) {
printf("This uninstall path is not correct %ls. Will not proceed further",
path.c_str());
return L"";
@@ -485,7 +486,7 @@
// Launches the chrome installer and waits for it to end.
void ChromeMiniInstaller::LaunchInstaller(const std::wstring& path,
const wchar_t* process_name) {
- ASSERT_TRUE(file_util::PathExists(path));
+ ASSERT_TRUE(file_util::PathExists(FilePath::FromWStringHack(path)));
if (install_type_ == mini_installer_constants::kSystemInstall) {
std::wstring launch_args = L" -system-level";
base::LaunchApp(L"\"" + path + L"\"" + launch_args, false, false, NULL);
@@ -504,7 +505,7 @@
file_util::AppendToPath(&path, mini_installer_constants::kChromeAppDir);
file_util::AppendToPath(&path, installer_util::kChromeExe);
launch_path->assign(path);
- return(file_util::PathExists(path));
+ return(file_util::PathExists(FilePath::FromWStringHack(path)));
}
// Launch Chrome to see if it works after overinstall. Then close it.
« no previous file with comments | « chrome/installer/util/shell_util.cc ('k') | chrome/test/mini_installer_test/mini_installer_test_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698