Adds option for JSON reader to allow invalid utf characters

chrome/browser/ui/app_list/start_page_service.cc

 // Copyright 2013 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/ui/app_list/start_page_service.h"
 
 #include <stddef.h>
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
+#include "base/json/json_reader.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/user_metrics.h"
 #include "base/strings/string_piece.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/media/webrtc/media_stream_devices_controller.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 626 matching lines @@
 void StartPageService::OnURLFetchComplete(const net::URLFetcher* source) {
   std::string json_data;
   source->GetResponseAsString(&json_data);
 
   // Remove XSSI guard for JSON parsing.
   size_t json_start_index = json_data.find("{");
   base::StringPiece json_data_substr(json_data);
   if (json_start_index != std::string::npos)
     json_data_substr.remove_prefix(json_start_index);
 
-  JSONStringValueDeserializer deserializer(json_data_substr);
-  deserializer.set_allow_trailing_comma(true);
+  JSONStringValueDeserializer deserializer(json_data_substr,
+                                           base::JSON_ALLOW_TRAILING_COMMAS);
   int error_code = 0;
   std::unique_ptr<base::Value> doodle_json =
       deserializer.Deserialize(&error_code, nullptr);
 
   base::TimeDelta recheck_delay;
   if (error_code != 0) {
     // On failure, use expotential backoff.
     backoff_entry_.InformOfRequest(false);
     recheck_delay = backoff_entry_.GetTimeUntilRelease();
   } else {
@@ skipping 12 matching lines @@
 
   // Check for a new doodle.
   content::BrowserThread::PostDelayedTask(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(&StartPageService::FetchDoodleJson,
                  weak_factory_.GetWeakPtr()),
       recheck_delay);
 }
 
 }  // namespace app_list