Move path functions from file_util to FilePath object.

chrome/test/mini_installer_test/installer_test_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/mini_installer_test/installer_test_util.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/process.h"
 #include "base/process_util.h"
@@ skipping 69 matching lines @@
   return GetInstallDirectory(system_level,
       BrowserDistribution::CHROME_BROWSER, path);
 }
 
 bool GetInstallDirectory(bool system_level,
                          BrowserDistribution::Type type, base::FilePath* path) {
   BrowserDistribution* dist =
       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(
     std::vector<installer_test::InstalledProduct>* products) {
   // Clear out the products list.
   products->clear();
   // Check user-level and system-level for products.
   BrowserDistribution* current_dist;
   installer_test::InstalledProduct current_prod;
   for (int i = 0; i < 2; ++i) {
@@ skipping 186 matching lines @@
     return false;
   }
   if (!base::WaitForSingleProcess(process, base::TimeDelta::FromMinutes(1))) {
     LOG(ERROR) << "Launched process did not complete.";
     return false;
   }
   return true;
 }
 
 }  // namespace