diff options
28 files changed, 73 insertions, 73 deletions
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index a1d0d4d..2cccfbd 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -264,7 +264,7 @@ source_set("browser") { "//components/navigation_interception", "//components/password_manager/content/browser", "//components/plugins/common", - "//components/safe_json_parser", + "//components/safe_json", "//components/sessions", "//components/storage_monitor", "//components/translate/content/browser", diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS index 7ffdeb7..28feeb1 100644 --- a/chrome/browser/DEPS +++ b/chrome/browser/DEPS @@ -71,7 +71,7 @@ include_rules = [ "+components/query_parser", "+components/rappor", "+components/renderer_context_menu", - "+components/safe_json_parser", + "+components/safe_json", "+components/search", "+components/search_engines", "+components/search_provider_logos", diff --git a/chrome/browser/extensions/DEPS b/chrome/browser/extensions/DEPS index fec4f0f..c8ec775 100644 --- a/chrome/browser/extensions/DEPS +++ b/chrome/browser/extensions/DEPS @@ -14,7 +14,7 @@ include_rules = [ # For access to testing command line switches. "+ppapi/shared_impl", - # For safe_json_parser - "+components/safe_json_parser", + # For safe_json + "+components/safe_json", "+ui/base", ] diff --git a/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc b/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc index 22dcd5e..0d06b3b 100644 --- a/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc +++ b/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc @@ -23,7 +23,7 @@ #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "chrome/common/web_application_info.h" #include "components/favicon/core/favicon_service.h" -#include "components/safe_json_parser/safe_json_parser.h" +#include "components/safe_json/safe_json_parser.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/utility_process_host.h" #include "content/public/browser/utility_process_host_client.h" @@ -184,8 +184,8 @@ void ChromeManagementAPIDelegate:: GetPermissionWarningsByManifestFunctionDelegate( extensions::ManagementGetPermissionWarningsByManifestFunction* function, const std::string& manifest_str) const { - scoped_refptr<safe_json_parser::SafeJsonParser> parser( - new safe_json_parser::SafeJsonParser( + scoped_refptr<safe_json::SafeJsonParser> parser( + new safe_json::SafeJsonParser( manifest_str, base::Bind( &extensions::ManagementGetPermissionWarningsByManifestFunction:: diff --git a/chrome/browser/extensions/webstore_data_fetcher.cc b/chrome/browser/extensions/webstore_data_fetcher.cc index 8c07cec..c6e5a57 100644 --- a/chrome/browser/extensions/webstore_data_fetcher.cc +++ b/chrome/browser/extensions/webstore_data_fetcher.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/values.h" #include "chrome/browser/extensions/webstore_data_fetcher_delegate.h" -#include "components/safe_json_parser/safe_json_parser.h" +#include "components/safe_json/safe_json_parser.h" #include "extensions/common/extension_urls.h" #include "net/base/load_flags.h" #include "net/url_request/url_fetcher.h" @@ -82,8 +82,8 @@ void WebstoreDataFetcher::OnURLFetchComplete(const net::URLFetcher* source) { std::string webstore_json_data; fetcher->GetResponseAsString(&webstore_json_data); - scoped_refptr<safe_json_parser::SafeJsonParser> parser = - new safe_json_parser::SafeJsonParser( + scoped_refptr<safe_json::SafeJsonParser> parser = + new safe_json::SafeJsonParser( webstore_json_data, base::Bind(&WebstoreDataFetcher::OnJsonParseSuccess, AsWeakPtr()), base::Bind(&WebstoreDataFetcher::OnJsonParseFailure, AsWeakPtr())); diff --git a/chrome/browser/extensions/webstore_install_helper.cc b/chrome/browser/extensions/webstore_install_helper.cc index 91292d6..37710ba 100644 --- a/chrome/browser/extensions/webstore_install_helper.cc +++ b/chrome/browser/extensions/webstore_install_helper.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/values.h" #include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h" -#include "components/safe_json_parser/safe_json_parser.h" +#include "components/safe_json/safe_json_parser.h" #include "content/public/browser/browser_thread.h" #include "net/base/load_flags.h" #include "net/url_request/url_request.h" @@ -49,7 +49,7 @@ void WebstoreInstallHelper::Start() { // Use base::Unretained so that base::Bind won't AddRef() on us. Otherwise, // we'll have two callbacks holding references to us, only one of which will // ever be called. - json_parser_ = new safe_json_parser::SafeJsonParser( + json_parser_ = new safe_json::SafeJsonParser( manifest_, base::Bind(&WebstoreInstallHelper::OnJSONParseSucceeded, base::Unretained(this)), diff --git a/chrome/browser/extensions/webstore_install_helper.h b/chrome/browser/extensions/webstore_install_helper.h index 7cdb865..90c6b65 100644 --- a/chrome/browser/extensions/webstore_install_helper.h +++ b/chrome/browser/extensions/webstore_install_helper.h @@ -26,7 +26,7 @@ namespace net { class URLRequestContextGetter; } -namespace safe_json_parser { +namespace safe_json { class SafeJsonParser; } @@ -96,7 +96,7 @@ class WebstoreInstallHelper : public base::RefCounted<WebstoreInstallHelper>, // The manifest to parse. std::string manifest_; - scoped_refptr<safe_json_parser::SafeJsonParser> json_parser_; + scoped_refptr<safe_json::SafeJsonParser> json_parser_; // If |icon_url_| is non-empty, it needs to be fetched and decoded into an // SkBitmap. diff --git a/chrome/browser/safe_json_parser_browsertest.cc b/chrome/browser/safe_json_parser_browsertest.cc index 97957f0..119ecbc 100644 --- a/chrome/browser/safe_json_parser_browsertest.cc +++ b/chrome/browser/safe_json_parser_browsertest.cc @@ -8,13 +8,13 @@ #include "base/memory/scoped_ptr.h" #include "base/values.h" #include "chrome/test/base/in_process_browser_test.h" -#include "components/safe_json_parser/safe_json_parser.h" +#include "components/safe_json/safe_json_parser.h" #include "content/public/test/test_browser_thread_bundle.h" #include "content/public/test/test_utils.h" namespace { -using safe_json_parser::SafeJsonParser; +using safe_json::SafeJsonParser; std::string MaybeToJson(const base::Value* value) { if (!value) diff --git a/chrome/browser/supervised_user/supervised_user_site_list.cc b/chrome/browser/supervised_user/supervised_user_site_list.cc index 52fc3d8..9c4d547 100644 --- a/chrome/browser/supervised_user/supervised_user_site_list.cc +++ b/chrome/browser/supervised_user/supervised_user_site_list.cc @@ -10,7 +10,7 @@ #include "base/metrics/histogram_macros.h" #include "base/task_runner_util.h" #include "base/values.h" -#include "components/safe_json_parser/safe_json_parser.h" +#include "components/safe_json/safe_json_parser.h" #include "content/public/browser/browser_thread.h" #include "url/gurl.h" @@ -156,8 +156,8 @@ void SupervisedUserSiteList::ParseJson( } // TODO(bauerb): Use batch mode to load multiple whitelists? - scoped_refptr<safe_json_parser::SafeJsonParser> parser( - new safe_json_parser::SafeJsonParser( + scoped_refptr<safe_json::SafeJsonParser> parser( + new safe_json::SafeJsonParser( json, base::Bind(&SupervisedUserSiteList::OnJsonParseSucceeded, path, base::TimeTicks::Now(), callback), base::Bind(&HandleError, path))); diff --git a/chrome/browser/ui/app_list/search/common/json_response_fetcher.cc b/chrome/browser/ui/app_list/search/common/json_response_fetcher.cc index cfda62b..f175e44 100644 --- a/chrome/browser/ui/app_list/search/common/json_response_fetcher.cc +++ b/chrome/browser/ui/app_list/search/common/json_response_fetcher.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/values.h" -#include "components/safe_json_parser/safe_json_parser.h" +#include "components/safe_json/safe_json_parser.h" #include "net/base/load_flags.h" #include "net/url_request/url_fetcher.h" #include "net/url_request/url_request_status.h" @@ -72,8 +72,8 @@ void JSONResponseFetcher::OnURLFetchComplete( std::string json_data; fetcher->GetResponseAsString(&json_data); - scoped_refptr<safe_json_parser::SafeJsonParser> parser = - new safe_json_parser::SafeJsonParser( + scoped_refptr<safe_json::SafeJsonParser> parser = + new safe_json::SafeJsonParser( json_data, base::Bind(&JSONResponseFetcher::OnJsonParseSuccess, weak_factory_.GetWeakPtr()), base::Bind(&JSONResponseFetcher::OnJsonParseError, diff --git a/chrome/browser/web_resource/chrome_web_resource_service.cc b/chrome/browser/web_resource/chrome_web_resource_service.cc index 47e37bd..6e1e35e 100644 --- a/chrome/browser/web_resource/chrome_web_resource_service.cc +++ b/chrome/browser/web_resource/chrome_web_resource_service.cc @@ -9,7 +9,7 @@ #include "base/memory/ref_counted.h" #include "chrome/browser/browser_process.h" #include "chrome/common/chrome_switches.h" -#include "components/safe_json_parser/safe_json_parser.h" +#include "components/safe_json/safe_json_parser.h" #include "url/gurl.h" ChromeWebResourceService::ChromeWebResourceService( @@ -39,8 +39,8 @@ void ChromeWebResourceService::ParseJSON( const SuccessCallback& success_callback, const ErrorCallback& error_callback) { // SafeJsonParser releases itself on completion. - scoped_refptr<safe_json_parser::SafeJsonParser> json_parser( - new safe_json_parser::SafeJsonParser(data, success_callback, + scoped_refptr<safe_json::SafeJsonParser> json_parser( + new safe_json::SafeJsonParser(data, success_callback, error_callback)); json_parser->Start(); } diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 587be4d..052cdaf 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -3264,7 +3264,7 @@ '../components/components.gyp:password_manager_content_browser', '../components/components.gyp:plugins_common', '../components/components.gyp:power', - '../components/components.gyp:safe_json_parser', + '../components/components.gyp:safe_json', '../components/components.gyp:sessions_content', '../components/components.gyp:storage_monitor', '../components/components.gyp:translate_content_browser', diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn index 803b289..ead790a 100644 --- a/chrome/utility/BUILD.gn +++ b/chrome/utility/BUILD.gn @@ -17,7 +17,7 @@ static_library("utility") { public_deps = [] deps = [ "//base", - "//components/safe_json_parser:safe_json_parser_message_filter", + "//components/safe_json:safe_json_parser_message_filter", "//components/search_engines", "//components/strings", "//components/url_fixer", diff --git a/chrome/utility/DEPS b/chrome/utility/DEPS index e621c4f..ed34680 100644 --- a/chrome/utility/DEPS +++ b/chrome/utility/DEPS @@ -3,7 +3,7 @@ include_rules = [ "+content/public/child", "+content/public/utility", "+components/wifi", - "+components/safe_json_parser", + "+components/safe_json", "+courgette", "+extensions/common", "+skia/ext", diff --git a/chrome/utility/safe_json_parser_handler.cc b/chrome/utility/safe_json_parser_handler.cc index e60cba3..3c67671 100644 --- a/chrome/utility/safe_json_parser_handler.cc +++ b/chrome/utility/safe_json_parser_handler.cc @@ -4,10 +4,10 @@ #include "chrome/utility/safe_json_parser_handler.h" -#include "components/safe_json_parser/safe_json_parser_message_filter.h" +#include "components/safe_json/safe_json_parser_message_filter.h" SafeJsonParserHandler::SafeJsonParserHandler() - : handler_(new safe_json_parser::SafeJsonParserMessageFilter) { + : handler_(new safe_json::SafeJsonParserMessageFilter) { } SafeJsonParserHandler::~SafeJsonParserHandler() { diff --git a/chrome/utility/safe_json_parser_handler.h b/chrome/utility/safe_json_parser_handler.h index d6809b6..8eeaf3e 100644 --- a/chrome/utility/safe_json_parser_handler.h +++ b/chrome/utility/safe_json_parser_handler.h @@ -9,13 +9,13 @@ #include "base/memory/scoped_ptr.h" #include "chrome/utility/utility_message_handler.h" -namespace safe_json_parser { +namespace safe_json { class SafeJsonParserMessageFilter; -} // namespace safe_json_parser +} // namespace safe_json // Dispatches IPCs for out of process JSON parsing. This is an adapter class -// that delegates to safe_json_parser::SafeJsonParserMessageFilter, since the -// SafeJsonParserMessageFilter in //components/safe_json_parser can't directly +// that delegates to safe_json::SafeJsonParserMessageFilter, since the +// SafeJsonParserMessageFilter in //components/safe_json can't directly // depend on //chrome/utility. class SafeJsonParserHandler : public UtilityMessageHandler { public: @@ -26,7 +26,7 @@ class SafeJsonParserHandler : public UtilityMessageHandler { bool OnMessageReceived(const IPC::Message& message) override; private: - scoped_ptr<safe_json_parser::SafeJsonParserMessageFilter> handler_; + scoped_ptr<safe_json::SafeJsonParserMessageFilter> handler_; DISALLOW_COPY_AND_ASSIGN(SafeJsonParserHandler); }; diff --git a/components/BUILD.gn b/components/BUILD.gn index c43048b..0d41d04 100644 --- a/components/BUILD.gn +++ b/components/BUILD.gn @@ -239,7 +239,7 @@ group("all_components") { "//components/guest_view/browser", "//components/guest_view/common", "//components/guest_view/renderer", - "//components/safe_json_parser", + "//components/safe_json", "//components/scheduler", "//components/test_runner", ] diff --git a/components/components.gyp b/components/components.gyp index 113b1ec..512802d 100644 --- a/components/components.gyp +++ b/components/components.gyp @@ -96,7 +96,7 @@ 'message_port.gypi', 'navigation_interception.gypi', 'power.gypi', - 'safe_json_parser.gypi', + 'safe_json.gypi', 'visitedlink.gypi', 'web_cache.gypi', 'web_contents_delegate_android.gypi', diff --git a/components/safe_json_parser.gypi b/components/safe_json.gypi index 04fb288..d3c5512 100644 --- a/components/safe_json_parser.gypi +++ b/components/safe_json.gypi @@ -5,8 +5,8 @@ { 'targets': [ { - # GN version: //components/safe_json_parser - 'target_name': 'safe_json_parser', + # GN version: //components/safe_json + 'target_name': 'safe_json', #'type': '<(component)', 'type': 'static_library', 'dependencies': [ @@ -20,11 +20,11 @@ '..', ], 'defines': [ - 'SAFE_JSON_PARSER_IMPLEMENTATION', + 'SAFE_JSON_IMPLEMENTATION', ], 'sources': [ - 'safe_json_parser/safe_json_parser.h', - 'safe_json_parser/safe_json_parser.cc', + 'safe_json/safe_json_parser.cc', + 'safe_json/safe_json_parser.h', ], }, { @@ -39,10 +39,10 @@ '..', ], 'sources': [ - 'safe_json_parser/safe_json_parser_messages.cc', - 'safe_json_parser/safe_json_parser_messages.h', - 'safe_json_parser/safe_json_parser_message_filter.cc', - 'safe_json_parser/safe_json_parser_message_filter.h', + 'safe_json/safe_json_parser_message_filter.cc', + 'safe_json/safe_json_parser_message_filter.h', + 'safe_json/safe_json_parser_messages.cc', + 'safe_json/safe_json_parser_messages.h', ], }, ], diff --git a/components/safe_json_parser/BUILD.gn b/components/safe_json/BUILD.gn index 95be97b..9238bef 100644 --- a/components/safe_json_parser/BUILD.gn +++ b/components/safe_json/BUILD.gn @@ -2,14 +2,14 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -# GYP version: components/safe_json_parser.gypi:safe_json_parser -static_library("safe_json_parser") { +# GYP version: components/safe_json.gypi:safe_json +static_library("safe_json") { sources = [ "safe_json_parser.cc", "safe_json_parser.h", ] - defines = [ "SAFE_JSON_PARSER_IMPLEMENTATION" ] + defines = [ "SAFE_JSON_IMPLEMENTATION" ] deps = [ ":safe_json_parser_message_filter", diff --git a/components/safe_json_parser/DEPS b/components/safe_json/DEPS index 4e771fc..4e771fc 100644 --- a/components/safe_json_parser/DEPS +++ b/components/safe_json/DEPS diff --git a/components/safe_json_parser/OWNERS b/components/safe_json/OWNERS index 311b3db..311b3db 100644 --- a/components/safe_json_parser/OWNERS +++ b/components/safe_json/OWNERS diff --git a/components/safe_json_parser/safe_json_parser.cc b/components/safe_json/safe_json_parser.cc index dc37325..af30a19 100644 --- a/components/safe_json_parser/safe_json_parser.cc +++ b/components/safe_json/safe_json_parser.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/safe_json_parser/safe_json_parser.h" +#include "components/safe_json/safe_json_parser.h" #include <string> @@ -11,7 +11,7 @@ #include "base/thread_task_runner_handle.h" #include "base/tuple.h" #include "base/values.h" -#include "components/safe_json_parser/safe_json_parser_messages.h" +#include "components/safe_json/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" @@ -21,7 +21,7 @@ using content::BrowserThread; using content::UtilityProcessHost; -namespace safe_json_parser { +namespace safe_json { SafeJsonParser::SafeJsonParser(const std::string& unsafe_json, const SuccessCallback& success_callback, @@ -101,4 +101,4 @@ bool SafeJsonParser::OnMessageReceived(const IPC::Message& message) { return handled; } -} // namespace safe_json_parser +} // namespace safe_json diff --git a/components/safe_json_parser/safe_json_parser.h b/components/safe_json/safe_json_parser.h index a9c6bb05..8fb703b 100644 --- a/components/safe_json_parser/safe_json_parser.h +++ b/components/safe_json/safe_json_parser.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef COMPONENTS_SAFE_JSON_PARSER_SAFE_JSON_PARSER_H_ -#define COMPONENTS_SAFE_JSON_PARSER_SAFE_JSON_PARSER_H_ +#ifndef COMPONENTS_SAFE_JSON_SAFE_JSON_PARSER_H_ +#define COMPONENTS_SAFE_JSON_SAFE_JSON_PARSER_H_ #include <string> @@ -22,7 +22,7 @@ namespace IPC { class Message; } -namespace safe_json_parser { +namespace safe_json { // SafeJsonParser parses a given JSON safely via a utility process. The object // is ref-counted and kept alive after Start() is called until one of the two @@ -63,6 +63,6 @@ class SafeJsonParser : public content::UtilityProcessHostClient { DISALLOW_COPY_AND_ASSIGN(SafeJsonParser); }; -} // namespace safe_json_parser +} // namespace safe_json -#endif // COMPONENTS_SAFE_JSON_PARSER_SAFE_JSON_PARSER_H_ +#endif // COMPONENTS_SAFE_JSON_SAFE_JSON_PARSER_H_ diff --git a/components/safe_json_parser/safe_json_parser_message_filter.cc b/components/safe_json/safe_json_parser_message_filter.cc index f5cf05e..8a377e7 100644 --- a/components/safe_json_parser/safe_json_parser_message_filter.cc +++ b/components/safe_json/safe_json_parser_message_filter.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/safe_json_parser/safe_json_parser_message_filter.h" +#include "components/safe_json/safe_json_parser_message_filter.h" #include "base/json/json_reader.h" #include "base/values.h" -#include "components/safe_json_parser/safe_json_parser_messages.h" +#include "components/safe_json/safe_json_parser_messages.h" #include "content/public/utility/utility_thread.h" #include "ipc/ipc_message.h" @@ -18,7 +18,7 @@ bool Send(IPC::Message* message) { } // namespace -namespace safe_json_parser { +namespace safe_json { SafeJsonParserMessageFilter::SafeJsonParserMessageFilter() { } @@ -52,4 +52,4 @@ void SafeJsonParserMessageFilter::OnParseJSON(const std::string& json) { content::UtilityThread::Get()->ReleaseProcessIfNeeded(); } -} // namespace safe_json_parser +} // namespace safe_json diff --git a/components/safe_json_parser/safe_json_parser_message_filter.h b/components/safe_json/safe_json_parser_message_filter.h index f0b061d..8fdecc4 100644 --- a/components/safe_json_parser/safe_json_parser_message_filter.h +++ b/components/safe_json/safe_json_parser_message_filter.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef COMPONENTS_SAFE_JSON_PARSER_SAFE_JSON_PARSER_MESSAGE_FILTER_H_ -#define COMPONENTS_SAFE_JSON_PARSER_SAFE_JSON_PARSER_MESSAGE_FILTER_H_ +#ifndef COMPONENTS_SAFE_JSON_SAFE_JSON_PARSER_MESSAGE_FILTER_H_ +#define COMPONENTS_SAFE_JSON_SAFE_JSON_PARSER_MESSAGE_FILTER_H_ #include <string> @@ -13,7 +13,7 @@ namespace IPC { class Message; } // namespace IPC -namespace safe_json_parser { +namespace safe_json { // A Handler for the ParseJSON IPC message that does the actual JSON parsing // in the sandboxed process. Modelled after IPC::MessageFilter but does not @@ -33,6 +33,6 @@ class SafeJsonParserMessageFilter { DISALLOW_COPY_AND_ASSIGN(SafeJsonParserMessageFilter); }; -} // namespace safe_json_parser +} // namespace safe_json -#endif // COMPONENTS_SAFE_JSON_PARSER_SAFE_JSON_PARSER_MESSAGE_FILTER_H_ +#endif // COMPONENTS_SAFE_JSON_SAFE_JSON_PARSER_MESSAGE_FILTER_H_ diff --git a/components/safe_json_parser/safe_json_parser_messages.cc b/components/safe_json/safe_json_parser_messages.cc index 2e2c5cf..e1485c2 100644 --- a/components/safe_json_parser/safe_json_parser_messages.cc +++ b/components/safe_json/safe_json_parser_messages.cc @@ -4,30 +4,30 @@ // Get basic type definitions. #define IPC_MESSAGE_IMPL -#include "components/safe_json_parser/safe_json_parser_messages.h" +#include "components/safe_json/safe_json_parser_messages.h" // Generate constructors. #include "ipc/struct_constructor_macros.h" -#include "components/safe_json_parser/safe_json_parser_messages.h" +#include "components/safe_json/safe_json_parser_messages.h" // Generate destructors. #include "ipc/struct_destructor_macros.h" -#include "components/safe_json_parser/safe_json_parser_messages.h" +#include "components/safe_json/safe_json_parser_messages.h" // Generate param traits write methods. #include "ipc/param_traits_write_macros.h" namespace IPC { -#include "components/safe_json_parser/safe_json_parser_messages.h" +#include "components/safe_json/safe_json_parser_messages.h" } // namespace IPC // Generate param traits read methods. #include "ipc/param_traits_read_macros.h" namespace IPC { -#include "components/safe_json_parser/safe_json_parser_messages.h" +#include "components/safe_json/safe_json_parser_messages.h" } // namespace IPC // Generate param traits log methods. #include "ipc/param_traits_log_macros.h" namespace IPC { -#include "components/safe_json_parser/safe_json_parser_messages.h" +#include "components/safe_json/safe_json_parser_messages.h" } // namespace IPC diff --git a/components/safe_json_parser/safe_json_parser_messages.h b/components/safe_json/safe_json_parser_messages.h index ad92795..ad92795 100644 --- a/components/safe_json_parser/safe_json_parser_messages.h +++ b/components/safe_json/safe_json_parser_messages.h |