diff options
author | gene@chromium.org <gene@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-09 02:48:35 +0000 |
---|---|---|
committer | gene@chromium.org <gene@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-09 02:48:35 +0000 |
commit | 6ce75aa28894bb1c324e62c44072f68b44d203d3 (patch) | |
tree | f0eb64cb588caefe5f3c49447650c9f0a21953d8 /chrome/service | |
parent | 0a860e4684d3c528cb169161cd75c8c53d361289 (diff) | |
download | chromium_src-6ce75aa28894bb1c324e62c44072f68b44d203d3.zip chromium_src-6ce75aa28894bb1c324e62c44072f68b44d203d3.tar.gz chromium_src-6ce75aa28894bb1c324e62c44072f68b44d203d3.tar.bz2 |
Make Cloud Print job status upper case (as required by server).
Review URL: http://codereview.chromium.org/9619031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125777 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/service')
-rw-r--r-- | chrome/service/cloud_print/cloud_print_helpers.cc | 10 | ||||
-rw-r--r-- | chrome/service/cloud_print/cloud_print_helpers_unittest.cc | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/chrome/service/cloud_print/cloud_print_helpers.cc b/chrome/service/cloud_print/cloud_print_helpers.cc index 603d741..631113a 100644 --- a/chrome/service/cloud_print/cloud_print_helpers.cc +++ b/chrome/service/cloud_print/cloud_print_helpers.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -20,16 +20,16 @@ std::string StringFromJobStatus(cloud_print::PrintJobStatus status) { std::string ret; switch (status) { case cloud_print::PRINT_JOB_STATUS_IN_PROGRESS: - ret = "in_progress"; + ret = "IN_PROGRESS"; break; case cloud_print::PRINT_JOB_STATUS_ERROR: - ret = "error"; + ret = "ERROR"; break; case cloud_print::PRINT_JOB_STATUS_COMPLETED: - ret = "done"; + ret = "DONE"; break; default: - ret = "unknown"; + ret = "UNKNOWN"; NOTREACHED(); break; } diff --git a/chrome/service/cloud_print/cloud_print_helpers_unittest.cc b/chrome/service/cloud_print/cloud_print_helpers_unittest.cc index f2a8397..d9d0772 100644 --- a/chrome/service/cloud_print/cloud_print_helpers_unittest.cc +++ b/chrome/service/cloud_print/cloud_print_helpers_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -47,18 +47,18 @@ void CheckURLs(const GURL& server_base_url) { url = CloudPrintHelpers::GetUrlForJobStatusUpdate( server_base_url, "12345678", cloud_print::PRINT_JOB_STATUS_IN_PROGRESS); expected_url = base::StringPrintf( - "%scontrol?jobid=12345678&status=in_progress", expected_url_base.c_str()); + "%scontrol?jobid=12345678&status=IN_PROGRESS", expected_url_base.c_str()); EXPECT_EQ(expected_url, url.spec()); url = CloudPrintHelpers::GetUrlForJobStatusUpdate( server_base_url, "12345678", cloud_print::PRINT_JOB_STATUS_ERROR); - expected_url = base::StringPrintf("%scontrol?jobid=12345678&status=error", + expected_url = base::StringPrintf("%scontrol?jobid=12345678&status=ERROR", expected_url_base.c_str()); EXPECT_EQ(expected_url, url.spec()); url = CloudPrintHelpers::GetUrlForJobStatusUpdate( server_base_url, "12345678", cloud_print::PRINT_JOB_STATUS_COMPLETED); - expected_url = base::StringPrintf("%scontrol?jobid=12345678&status=done", + expected_url = base::StringPrintf("%scontrol?jobid=12345678&status=DONE", expected_url_base.c_str()); EXPECT_EQ(expected_url, url.spec()); @@ -71,7 +71,7 @@ void CheckURLs(const GURL& server_base_url) { url = CloudPrintHelpers::GetUrlForJobStatusUpdate(server_base_url, "87654321", details); expected_url = base::StringPrintf( - "%scontrol?jobid=87654321&status=in_progress&code=2" + "%scontrol?jobid=87654321&status=IN_PROGRESS&code=2" "&message=Out%%20of%%20Paper&numpages=345&pagesprinted=47", expected_url_base.c_str()); EXPECT_EQ(expected_url, url.spec()); |