| Index: chrome/service/cloud_print/print_system_cups.cc
|
| diff --git a/chrome/service/cloud_print/print_system_cups.cc b/chrome/service/cloud_print/print_system_cups.cc
|
| index 0d8f270ea825c20f3fdd8a24bdb84b9846ed187d..18c4d4c3647e128966991c58aef623fd802a414a 100644
|
| --- a/chrome/service/cloud_print/print_system_cups.cc
|
| +++ b/chrome/service/cloud_print/print_system_cups.cc
|
| @@ -25,8 +25,8 @@
|
| #include "base/strings/string_util.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/values.h"
|
| -#include "chrome/common/child_process_logging.h"
|
| #include "chrome/common/cloud_print/cloud_print_constants.h"
|
| +#include "chrome/common/crash_keys.h"
|
| #include "chrome/service/cloud_print/cloud_print_helpers.h"
|
| #include "grit/generated_resources.h"
|
| #include "printing/backend/cups_helper.h"
|
| @@ -264,7 +264,7 @@ class PrinterWatcherCUPS
|
| PrintSystem::PrinterWatcher::Delegate* delegate) OVERRIDE{
|
| scoped_refptr<printing::PrintBackend> print_backend(
|
| printing::PrintBackend::CreateInstance(NULL));
|
| - child_process_logging::ScopedPrinterInfoSetter prn_info(
|
| + crash_keys::ScopedPrinterInfo crash_key(
|
| print_backend->GetPrinterDriverInfo(printer_name_));
|
| if (delegate_ != NULL)
|
| StopWatching();
|
| @@ -595,7 +595,7 @@ bool PrintSystemCUPS::GetPrinterCapsAndDefaults(
|
| }
|
|
|
| // TODO(gene): Retry multiple times in case of error.
|
| - child_process_logging::ScopedPrinterInfoSetter prn_info(
|
| + crash_keys::ScopedPrinterInfo crash_key(
|
| server_info->backend->GetPrinterDriverInfo(short_printer_name));
|
| if (!server_info->backend->GetPrinterCapsAndDefaults(short_printer_name,
|
| printer_info) ) {
|
| @@ -618,7 +618,7 @@ bool PrintSystemCUPS::GetJobDetails(const std::string& printer_name,
|
| if (!server_info)
|
| return false;
|
|
|
| - child_process_logging::ScopedPrinterInfoSetter prn_info(
|
| + crash_keys::ScopedPrinterInfo crash_key(
|
| server_info->backend->GetPrinterDriverInfo(short_printer_name));
|
| cups_job_t* jobs = NULL;
|
| int num_jobs = GetJobs(&jobs, server_info->url, cups_encryption_,
|
| @@ -778,7 +778,7 @@ PlatformJobId PrintSystemCUPS::SpoolPrintJob(
|
| if (!server_info)
|
| return false;
|
|
|
| - child_process_logging::ScopedPrinterInfoSetter prn_info(
|
| + crash_keys::ScopedPrinterInfo crash_key(
|
| server_info->backend->GetPrinterDriverInfo(printer_name));
|
|
|
| // We need to store options as char* string for the duration of the
|
|
|