Replace FilePath with base::FilePath in some more top level directories.
Review URL: https://codereview.chromium.org/12217101
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181640 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/printing/backend/cups_helper.cc b/printing/backend/cups_helper.cc
index 5b500e7c..14ae2d5 100644
--- a/printing/backend/cups_helper.cc
+++ b/printing/backend/cups_helper.cc
@@ -31,7 +31,8 @@
const char kDuplexNone[] = "None";
#if !defined(OS_MACOSX)
-void ParseLpOptions(const FilePath& filepath, const std::string& printer_name,
+void ParseLpOptions(const base::FilePath& filepath,
+ const std::string& printer_name,
int* num_options, cups_option_t** options) {
std::string content;
if (!file_util::ReadFileToString(filepath, &content))
@@ -93,12 +94,12 @@
const char kSystemLpOptionPath[] = "/etc/cups/lpoptions";
const char kUserLpOptionPath[] = ".cups/lpoptions";
- std::vector<FilePath> file_locations;
- file_locations.push_back(FilePath(kSystemLpOptionPath));
- file_locations.push_back(FilePath(
+ std::vector<base::FilePath> file_locations;
+ file_locations.push_back(base::FilePath(kSystemLpOptionPath));
+ file_locations.push_back(base::FilePath(
file_util::GetHomeDir().Append(kUserLpOptionPath)));
- for (std::vector<FilePath>::const_iterator it = file_locations.begin();
+ for (std::vector<base::FilePath>::const_iterator it = file_locations.begin();
it != file_locations.end(); ++it) {
num_options = 0;
options = NULL;
@@ -340,7 +341,7 @@
const std::string& printer_name,
const std::string& printer_capabilities,
PrinterSemanticCapsAndDefaults* printer_info) {
- FilePath ppd_file_path;
+ base::FilePath ppd_file_path;
if (!file_util::CreateTemporaryFile(&ppd_file_path))
return false;