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

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

Issue 6069004: Use FilePath::BaseName instead of the deprecated file_util::GetFilenameFromPath. Part 3. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years 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 | « no previous file | 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
diff --git a/chrome/test/mini_installer_test/chrome_mini_installer.cc b/chrome/test/mini_installer_test/chrome_mini_installer.cc
index 7cafd20416340560f2d680ebd0d1eed6d4adfb24..5e7aae1707ea4bf7d250a187ed152687db22b33e 100644
--- a/chrome/test/mini_installer_test/chrome_mini_installer.cc
+++ b/chrome/test/mini_installer_test/chrome_mini_installer.cc
@@ -130,13 +130,13 @@ void ChromeMiniInstaller::InstallFullInstaller(bool over_install) {
// Installs the Chrome mini-installer, checks the registry and shortcuts.
void ChromeMiniInstaller::InstallMiniInstaller(bool over_install,
const std::wstring& path) {
- std::wstring exe_name = file_util::GetFilenameFromPath(path);
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(FilePath(path))) << path
- << " does not exist.";
- LaunchInstaller(path, exe_name.c_str());
+
+ FilePath exe_path(path);
+ ASSERT_TRUE(file_util::PathExists(exe_path)) << path << " does not exist.";
+ LaunchInstaller(path, exe_path.BaseName().value().c_str());
BrowserDistribution* dist = BrowserDistribution::GetDistribution();
ASSERT_TRUE(CheckRegistryKey(dist->GetVersionKey())) << dist->GetVersionKey()
<< " does not exist.";
« no previous file with comments | « no previous file | 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