Cloud Print connector is now using local_settings field from GCP 2.0. "current" section contain current ping timeout from the connector. "pending" section will contain a proposed change from the server side. Connector will look up any new params in the "pending" section and store and use this value. If there is nothing in the pending section, current value from the config file will be used.

(This logic can be revisited once we re-write connector)
Clean up ticket validation error message.

BUG=297393

Review URL: https://codereview.chromium.org/24392003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225403 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 1 deletions

diff --git a/chrome/service/cloud_print/printer_job_handler_unittest.cc b/chrome/service/cloud_print/printer_job_handler_unittest.cc
index 13736d3..a41b3e8 100644
--- a/chrome/service/cloud_print/printer_job_handler_unittest.cc
+++ b/chrome/service/cloud_print/printer_job_handler_unittest.cc
@@ -231,7 +231,8 @@ std::string DownloadURI(int job_num) {
 std::string InProgressURI(int job_num) {
   return GetUrlForJobStatusUpdate(GURL(kExampleCloudPrintServerURL),
                                   StringPrintf(kExampleJobID, job_num),
-                                  PRINT_JOB_STATUS_IN_PROGRESS).spec();
+                                  PRINT_JOB_STATUS_IN_PROGRESS,
+                                  0).spec();
 }
 
 std::string StatusResponse(int job_num, const char* status_string) {
@@ -474,6 +475,8 @@ void PrinterJobHandlerTest::SetUp() {
   info_from_cloud_.tags_hash = GetHashOfPrinterInfo(basic_info_);
 
   info_from_cloud_.caps_hash = base::MD5String(kExamplePrinterCapabilities);
+  info_from_cloud_.current_xmpp_timeout = 300;
+  info_from_cloud_.pending_xmpp_timeout = 0;
 
   caps_and_defaults_.printer_capabilities = kExamplePrinterCapabilities;
   caps_and_defaults_.caps_mime_type = kExampleCapsMimeType;