summaryrefslogtreecommitdiffstats
path: root/chrome/service
diff options
context:
space:
mode:
authorrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-11 00:15:41 +0000
committerrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-11 00:15:41 +0000
commitcd57857578b7b905ee27580d8ca279f6f7642e82 (patch)
tree82230a21554f358452b508ee64ef1ea3efcb518b /chrome/service
parentcc7cde43832b547cdab856fe1bedc9514ca38e13 (diff)
downloadchromium_src-cd57857578b7b905ee27580d8ca279f6f7642e82.zip
chromium_src-cd57857578b7b905ee27580d8ca279f6f7642e82.tar.gz
chromium_src-cd57857578b7b905ee27580d8ca279f6f7642e82.tar.bz2
Modify the base::JSONReader interface to take a set of options rather than a boolean flag.
This is just prep work for a large CL that rewrites the JSON parser. Splitting out this interface change will make it easier to review the other CL. BUG=121469 TEST=No functional change. Review URL: https://chromiumcodereview.appspot.com/9960077 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131680 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/service')
-rw-r--r--chrome/service/cloud_print/print_system_cups.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/service/cloud_print/print_system_cups.cc b/chrome/service/cloud_print/print_system_cups.cc
index e3440c7..cbaf2cd 100644
--- a/chrome/service/cloud_print/print_system_cups.cc
+++ b/chrome/service/cloud_print/print_system_cups.cc
@@ -510,8 +510,7 @@ bool PrintSystemCUPS::IsValidPrinter(const std::string& printer_name) {
bool PrintSystemCUPS::ValidatePrintTicket(const std::string& printer_name,
const std::string& print_ticket_data) {
DCHECK(initialized_);
- scoped_ptr<Value> ticket_value(base::JSONReader::Read(print_ticket_data,
- false));
+ scoped_ptr<Value> ticket_value(base::JSONReader::Read(print_ticket_data));
return ticket_value != NULL && ticket_value->IsType(Value::TYPE_DICTIONARY);
}
@@ -520,7 +519,7 @@ bool PrintSystemCUPS::ParsePrintTicket(
const std::string& print_ticket,
std::map<std::string, std::string>* options) {
DCHECK(options);
- scoped_ptr<Value> ticket_value(base::JSONReader::Read(print_ticket, false));
+ scoped_ptr<Value> ticket_value(base::JSONReader::Read(print_ticket));
if (ticket_value == NULL || !ticket_value->IsType(Value::TYPE_DICTIONARY))
return false;