Modify the base::JSONReader interface to take a set of options rather than a boolean flag.

chrome/browser/chrome_to_mobile_service.cc

 // 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.
 
 #include "chrome/browser/chrome_to_mobile_service.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 388 matching lines @@
 
 void ChromeToMobileService::HandleAccountInfoResponse() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   std::string data;
   account_info_request_->GetResponseAsString(&data);
   account_info_request_.reset();
 
   ListValue* services = NULL;
   DictionaryValue* dictionary = NULL;
-  scoped_ptr<Value> json(base::JSONReader::Read(data, false));
+  scoped_ptr<Value> json(base::JSONReader::Read(data));
   StringValue cloud_print_service(kCloudPrintSerivceValue);
   if (json.get() && json->GetAsDictionary(&dictionary) && dictionary &&
       dictionary->GetList(kAccountServicesKey, &services) && services &&
       services->Find(cloud_print_service) != services->end()) {
     cloud_print_accessible_ = true;
     RequestMobileListUpdate();
   }
 }
 
 void ChromeToMobileService::HandleSearchResponse() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   std::string data;
   search_request_->GetResponseAsString(&data);
   search_request_.reset();
 
   ListValue* list = NULL;
   DictionaryValue* dictionary = NULL;
-  scoped_ptr<Value> json(base::JSONReader::Read(data, false));
+  scoped_ptr<Value> json(base::JSONReader::Read(data));
   if (json.get() && json->GetAsDictionary(&dictionary) && dictionary &&
       dictionary->GetList(cloud_print::kPrinterListValue, &list)) {
     ScopedVector<base::DictionaryValue> mobiles;
     for (size_t index = 0; index < list->GetSize(); index++) {
       DictionaryValue* mobile_data = NULL;
       if (list->GetDictionary(index, &mobile_data)) {
         std::string mobile_type;
         mobile_data->GetString("type", &mobile_type);
         if (mobile_type.compare(kTypeAndroidChromeSnapshot) == 0)
           mobiles.push_back(mobile_data->DeepCopy());
@@ skipping 17 matching lines @@
   base::WeakPtr<Observer> observer = i->second;
   request_observer_map_.erase(i);
   if (!observer.get())
     return;
 
   // Get the success value from the CloudPrint server response data.
   std::string data;
   source->GetResponseAsString(&data);
   bool success = false;
   DictionaryValue* dictionary = NULL;
-  scoped_ptr<Value> json(base::JSONReader::Read(data, false));
+  scoped_ptr<Value> json(base::JSONReader::Read(data));
   if (json.get() && json->GetAsDictionary(&dictionary) && dictionary)
     dictionary->GetBoolean("success", &success);
 
   // Check if the observer is waiting on a second response (url and snapshot).
   RequestObserverMap::iterator other = request_observer_map_.begin();
   for (; other != request_observer_map_.end(); ++other) {
     if (other->second == observer) {
       // Do not call OnSendComplete for observers waiting on a second response.
       if (success)
         return;
 
       // Ensure a second response is not sent after reporting failure below.
       request_observer_map_.erase(other);
       break;
     }
   }
 
   observer->OnSendComplete(success);
 }