| Index: chrome/utility/chrome_content_utility_client.cc
|
| diff --git a/chrome/utility/chrome_content_utility_client.cc b/chrome/utility/chrome_content_utility_client.cc
|
| index 8bd49b41ab339f9c7cc56db93da6ead3a4bcff82..05d016a34eeca6e40df623796b274ad8a5490ab7 100644
|
| --- a/chrome/utility/chrome_content_utility_client.cc
|
| +++ b/chrome/utility/chrome_content_utility_client.cc
|
| @@ -17,8 +17,8 @@
|
| #include "chrome/common/safe_browsing/zip_analyzer_results.h"
|
| #include "chrome/utility/chrome_content_utility_ipc_whitelist.h"
|
| #include "chrome/utility/image_decoder_impl.h"
|
| -#include "chrome/utility/safe_json_parser_handler.h"
|
| #include "chrome/utility/utility_message_handler.h"
|
| +#include "components/safe_json/utility/safe_json_parser_mojo_impl.h"
|
| #include "content/public/child/image_decoder_utils.h"
|
| #include "content/public/common/content_switches.h"
|
| #include "content/public/common/service_registry.h"
|
| @@ -128,8 +128,6 @@ ChromeContentUtilityClient::ChromeContentUtilityClient()
|
| #if defined(OS_WIN)
|
| handlers_.push_back(new ShellHandler());
|
| #endif
|
| -
|
| - handlers_.push_back(new SafeJsonParserHandler());
|
| }
|
|
|
| ChromeContentUtilityClient::~ChromeContentUtilityClient() {
|
| @@ -200,6 +198,7 @@ void ChromeContentUtilityClient::RegisterMojoServices(
|
| registry->AddService(base::Bind(CreateResourceUsageReporter));
|
| #endif
|
| registry->AddService(base::Bind(&CreateImageDecoder));
|
| + registry->AddService(base::Bind(&safe_json::SafeJsonParserMojoImpl::Create));
|
| }
|
|
|
| void ChromeContentUtilityClient::AddHandler(
|
|
|