| Index: chrome/browser/extensions/webstore_install_helper.cc
|
| diff --git a/chrome/browser/extensions/webstore_install_helper.cc b/chrome/browser/extensions/webstore_install_helper.cc
|
| index 948d9954134fe6b38718be0cd34471830942c63a..214f0784fc6e05d3e67e7748552c3777b9890f85 100644
|
| --- a/chrome/browser/extensions/webstore_install_helper.cc
|
| +++ b/chrome/browser/extensions/webstore_install_helper.cc
|
| @@ -7,14 +7,15 @@
|
| #include <string>
|
|
|
| #include "base/bind.h"
|
| +#include "base/strings/utf_string_conversions.h"
|
| #include "base/thread_task_runner_handle.h"
|
| #include "base/values.h"
|
| #include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h"
|
| #include "chrome/common/chrome_utility_messages.h"
|
| -#include "chrome/common/extensions/chrome_utility_extensions_messages.h"
|
| -#include "chrome/grit/generated_resources.h"
|
| +#include "components/safe_json_parser/safe_json_parser_messages.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/utility_process_host.h"
|
| +#include "grit/components_strings.h"
|
| #include "net/base/load_flags.h"
|
| #include "net/url_request/url_request.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| @@ -74,20 +75,19 @@ void WebstoreInstallHelper::StartWorkOnIOThread() {
|
| CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
| utility_host_ = UtilityProcessHost::Create(
|
| this, base::ThreadTaskRunnerHandle::Get().get())->AsWeakPtr();
|
| - utility_host_->SetName(l10n_util::GetStringUTF16(
|
| - IDS_UTILITY_PROCESS_JSON_PARSER_NAME));
|
| + utility_host_->SetName(
|
| + l10n_util::GetStringUTF16(IDS_UTILITY_PROCESS_JSON_PARSER_NAME));
|
| utility_host_->StartBatchMode();
|
|
|
| - utility_host_->Send(new ChromeUtilityMsg_ParseJSON(manifest_));
|
| + utility_host_->Send(new SafeJsonParserMsg_ParseJSON(manifest_));
|
| }
|
|
|
| bool WebstoreInstallHelper::OnMessageReceived(const IPC::Message& message) {
|
| bool handled = true;
|
| IPC_BEGIN_MESSAGE_MAP(WebstoreInstallHelper, message)
|
| - IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_ParseJSON_Succeeded,
|
| - OnJSONParseSucceeded)
|
| - IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_ParseJSON_Failed,
|
| - OnJSONParseFailed)
|
| + IPC_MESSAGE_HANDLER(SafeJsonParserHostMsg_ParseJSON_Succeeded,
|
| + OnJSONParseSucceeded)
|
| + IPC_MESSAGE_HANDLER(SafeJsonParserHostMsg_ParseJSON_Failed, OnJSONParseFailed)
|
| IPC_MESSAGE_UNHANDLED(handled = false)
|
| IPC_END_MESSAGE_MAP()
|
| return handled;
|
|
|