| 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 6bef1f6c2c2d2504981a6ffda1d5b8bceacbd358..2a313e3b0321acc8d86843c42cb72df926d640b8 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/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() {
|
| @@ -201,6 +199,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(
|
|
|