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

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

Issue 13196006: Move path functions from file_util to FilePath object. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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/test/mini_installer_test/installer_test_util.cc
diff --git a/chrome/test/mini_installer_test/installer_test_util.cc b/chrome/test/mini_installer_test/installer_test_util.cc
index 2cf45319b489b80150cf573b9821a175808ff029..9c14dab2212dedf707f56482fb2ae330f3ac84bb 100644
--- a/chrome/test/mini_installer_test/installer_test_util.cc
+++ b/chrome/test/mini_installer_test/installer_test_util.cc
@@ -87,13 +87,11 @@ bool GetInstallDirectory(bool system_level,
BrowserDistribution::GetSpecificDistribution(type);
*path = installer::GetChromeInstallPath(system_level, dist);
base::FilePath parent;
- if (system_level) {
+ if (system_level)
PathService::Get(base::DIR_PROGRAM_FILES, &parent);
- return file_util::ContainsPath(parent, *path);
- } else {
+ else
PathService::Get(base::DIR_LOCAL_APP_DATA, &parent);
- return file_util::ContainsPath(parent, *path);
- }
+ return parent.IsParent(*path);
}
bool GetInstalledProducts(

Powered by Google App Engine
This is Rietveld 408576698