Commit 420827bb authored by Daniel Bratell's avatar Daniel Bratell Committed by Commit Bot

[jumbo] Rename one of the OnNetworkServiceCrashed methods.

In jumbo builds, many cc files compile in the same translation
unit which means that they also share the same anonymous namespace.
This makes it necessary for constants and global scope functions
to have names that are unique in the build target.

This particular error only happens in extreme jumbo (many files
compiled at once) and not the more modest jumbo configurations
(8-50 files compiled at once) I think.

Change-Id: I86d15bcfd5c55db9592cb9423943d2e46b8f2e5c
Reviewed-on: https://chromium-review.googlesource.com/c/1297361Reviewed-by: default avatarŁukasz Anforowicz <lukasza@chromium.org>
Reviewed-by: default avatarJohn Abd-El-Malek <jam@chromium.org>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#602359}
parent 9f54d240
...@@ -1239,7 +1239,7 @@ std::set<int>& GetCurrentCorbPluginExceptions() { ...@@ -1239,7 +1239,7 @@ std::set<int>& GetCurrentCorbPluginExceptions() {
return *s_data; return *s_data;
} }
void OnNetworkServiceCrash() { void OnNetworkServiceCrashForCorb() {
DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_CURRENTLY_ON(BrowserThread::UI);
network::mojom::NetworkService* network_service = GetNetworkService(); network::mojom::NetworkService* network_service = GetNetworkService();
for (int process_id : GetCurrentCorbPluginExceptions()) for (int process_id : GetCurrentCorbPluginExceptions())
...@@ -1289,7 +1289,7 @@ void AddCorbExceptionForPluginOnUIThread(int process_id) { ...@@ -1289,7 +1289,7 @@ void AddCorbExceptionForPluginOnUIThread(int process_id) {
static NetworkServiceCrashHandlerId s_crash_handler_id; static NetworkServiceCrashHandlerId s_crash_handler_id;
if (s_crash_handler_id.is_null()) { if (s_crash_handler_id.is_null()) {
s_crash_handler_id = RegisterNetworkServiceCrashHandler( s_crash_handler_id = RegisterNetworkServiceCrashHandler(
base::BindRepeating(&OnNetworkServiceCrash)); base::BindRepeating(&OnNetworkServiceCrashForCorb));
} }
GetCurrentCorbPluginExceptions().insert(process_id); GetCurrentCorbPluginExceptions().insert(process_id);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment