Index: printing/backend/print_backend_cups.cc |
diff --git a/printing/backend/print_backend_cups.cc b/printing/backend/print_backend_cups.cc |
index c2f236b5e891949a08c36eb535314fa6765a1f68..bd51130c1df321bcc3cd9609707984cf1001a2da 100644 |
--- a/printing/backend/print_backend_cups.cc |
+++ b/printing/backend/print_backend_cups.cc |
@@ -128,7 +128,7 @@ class PrintBackendCUPS : public PrintBackend { |
// version in another case. There is an issue specifing CUPS_HTTP_DEFAULT |
// in the <functions>2(), it does not work in CUPS prior to 1.4. |
int GetDests(cups_dest_t** dests); |
- FilePath GetPPD(const char* name); |
+ base::FilePath GetPPD(const char* name); |
GURL print_server_url_; |
http_encryption_t cups_encryption_; |
@@ -235,7 +235,7 @@ bool PrintBackendCUPS::GetPrinterCapsAndDefaults( |
VLOG(1) << "CUPS: Getting caps and defaults" |
<< ", printer name: " << printer_name; |
- FilePath ppd_path(GetPPD(printer_name.c_str())); |
+ base::FilePath ppd_path(GetPPD(printer_name.c_str())); |
// In some cases CUPS failed to get ppd file. |
if (ppd_path.empty()) { |
LOG(ERROR) << "CUPS: Failed to get PPD" |
@@ -332,12 +332,12 @@ FilePath PrintBackendCUPS::GetPPD(const char* name) { |
// Protect this code with lock. |
CR_DEFINE_STATIC_LOCAL(base::Lock, ppd_lock, ()); |
base::AutoLock ppd_autolock(ppd_lock); |
- FilePath ppd_path; |
+ base::FilePath ppd_path; |
const char* ppd_file_path = NULL; |
if (print_server_url_.is_empty()) { // Use default (local) print server. |
ppd_file_path = cupsGetPPD(name); |
if (ppd_file_path) |
- ppd_path = FilePath(ppd_file_path); |
+ ppd_path = base::FilePath(ppd_file_path); |
} else { |
// cupsGetPPD2 gets stuck sometimes in an infinite time due to network |
// configuration/issues. To prevent that, use non-blocking http connection |
@@ -360,7 +360,7 @@ FilePath PrintBackendCUPS::GetPPD(const char* name) { |
// Comparing file size against that content length might be unreliable |
// since some http reponses are encoded and content_length > file size. |
// Let's just check for the obvious CUPS and http errors here. |
- ppd_path = FilePath(ppd_file_path); |
+ ppd_path = base::FilePath(ppd_file_path); |
ipp_status_t error_code = cupsLastError(); |
int http_error = httpError(http.http()); |
if (error_code > IPP_OK_EVENTS_COMPLETE || http_error != 0) { |