Index: components/safe_json_parser/safe_json_parser.cc |
diff --git a/chrome/browser/safe_json_parser.cc b/components/safe_json_parser/safe_json_parser.cc |
similarity index 69% |
rename from chrome/browser/safe_json_parser.cc |
rename to components/safe_json_parser/safe_json_parser.cc |
index 232fdd43daed61c90439de21ebb0189410a61660..64ee5fe05d8fb19694acd672c2cf6b9603731553 100644 |
--- a/chrome/browser/safe_json_parser.cc |
+++ b/components/safe_json_parser/safe_json_parser.cc |
@@ -2,41 +2,53 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "chrome/browser/safe_json_parser.h" |
+#include "components/safe_json_parser/safe_json_parser.h" |
-#include "chrome/common/chrome_utility_messages.h" |
-#include "chrome/grit/generated_resources.h" |
+#include <string> |
+ |
+#include "base/strings/utf_string_conversions.h" |
+#include "base/tuple.h" |
+#include "base/values.h" |
+#include "ipc/ipc_message_macros.h" |
jam
2015/05/18 23:59:19
nit: this is an internal file, you shouldn't have
Eran Messeri
2015/05/19 20:49:56
Done.
|
+#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 "ui/base/l10n/l10n_util.h" |
using content::BrowserThread; |
using content::UtilityProcessHost; |
+namespace { |
+ |
+const char* kJSONParserProcessName = "JSON Parser"; |
+ |
+} // namespace |
+ |
+namespace safe_json_parser { |
+ |
SafeJsonParser::SafeJsonParser(const std::string& unsafe_json, |
const SuccessCallback& success_callback, |
const ErrorCallback& error_callback) |
: unsafe_json_(unsafe_json), |
success_callback_(success_callback), |
- error_callback_(error_callback) {} |
+ error_callback_(error_callback) { |
+} |
void SafeJsonParser::Start() { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
BrowserThread::PostTask( |
- BrowserThread::IO, |
- FROM_HERE, |
+ BrowserThread::IO, FROM_HERE, |
base::Bind(&SafeJsonParser::StartWorkOnIOThread, this)); |
} |
-SafeJsonParser::~SafeJsonParser() {} |
+SafeJsonParser::~SafeJsonParser() { |
+} |
void SafeJsonParser::StartWorkOnIOThread() { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
UtilityProcessHost* host = |
UtilityProcessHost::Create(this, base::MessageLoopProxy::current().get()); |
- host->SetName(l10n_util::GetStringUTF16( |
- IDS_UTILITY_PROCESS_JSON_PARSER_NAME)); |
- host->Send(new ChromeUtilityMsg_ParseJSON(unsafe_json_)); |
+ host->SetName(base::ASCIIToUTF16(kJSONParserProcessName)); |
jam
2015/05/18 23:59:19
seems like a regression here that you switch from
Eran Messeri
2015/05/19 20:49:56
Correct.
It does not seem to be trivial to get int
jam
2015/05/20 15:38:31
Everywhere else that sets process names in the tas
Eran Messeri
2015/05/26 16:19:59
Done - added the localized string back as suggeste
|
+ host->Send(new SafeJsonParserMsg_ParseJSON(unsafe_json_)); |
} |
void SafeJsonParser::OnJSONParseSucceeded(const base::ListValue& wrapper) { |
@@ -58,8 +70,7 @@ void SafeJsonParser::ReportResults() { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
BrowserThread::PostTask( |
- BrowserThread::UI, |
- FROM_HERE, |
+ BrowserThread::UI, FROM_HERE, |
base::Bind(&SafeJsonParser::ReportResultOnUIThread, this)); |
} |
@@ -77,11 +88,12 @@ void SafeJsonParser::ReportResultOnUIThread() { |
bool SafeJsonParser::OnMessageReceived(const IPC::Message& message) { |
bool handled = true; |
IPC_BEGIN_MESSAGE_MAP(SafeJsonParser, message) |
- IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_ParseJSON_Succeeded, |
- OnJSONParseSucceeded) |
- IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_ParseJSON_Failed, |
- OnJSONParseFailed) |
- IPC_MESSAGE_UNHANDLED(handled = false) |
+ 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; |
} |
+ |
+} // namespace safe_json_parser |