Commit 8cf9efdb authored by Patrick Monette's avatar Patrick Monette Committed by Commit Bot

Revert "[PM] Change DCHECKs into DumpWithoutCrashing in SWContextAdapter"

This reverts commit 1bc384a5.

Reason for revert: This CL produced enough crashes that it is no
longer needed.

Original change's description:
> [PM] Change DCHECKs into DumpWithoutCrashing in SWContextAdapter
>
> The DCHECKs were added to generate crashes to help me solve a lifetime
> issue with service worker controllees, but I underestimated how often
> the issue happens and have had no crashes yet.
>
> Changing them to DumpWithoutCrashing will make it so that anyone on
> canary will be able to hit them.
>
> This CL is meant to be reverted as soon as enough crashes are received
> to debug the root issue.
>
> Bug: 1086944, 1088353
> Change-Id: I50904f30ba8d23a5e5661edf8f1cf4d341e6dfef
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2444370
> Reviewed-by: François Doray <fdoray@chromium.org>
> Commit-Queue: Patrick Monette <pmonette@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#813227}

TBR=fdoray@chromium.org,pmonette@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1086944
Bug: 1088353
Change-Id: Ic2ca0f2ea13ebcfb5f08c1f6cff312ef89078fa1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2492620Reviewed-by: default avatarPatrick Monette <pmonette@chromium.org>
Reviewed-by: default avatarFrançois Doray <fdoray@chromium.org>
Auto-Submit: Patrick Monette <pmonette@chromium.org>
Commit-Queue: François Doray <fdoray@chromium.org>
Cr-Commit-Position: refs/heads/master@{#820038}
parent d63ab91a
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
#include "components/performance_manager/service_worker_context_adapter.h" #include "components/performance_manager/service_worker_context_adapter.h"
#include "base/check_op.h" #include "base/check_op.h"
#include "base/debug/dump_without_crashing.h"
#include "base/notreached.h" #include "base/notreached.h"
#include "content/public/browser/render_process_host.h" #include "content/public/browser/render_process_host.h"
#include "content/public/browser/render_process_host_observer.h" #include "content/public/browser/render_process_host_observer.h"
...@@ -277,7 +276,7 @@ void ServiceWorkerContextAdapter::OnControlleeAdded( ...@@ -277,7 +276,7 @@ void ServiceWorkerContextAdapter::OnControlleeAdded(
bool inserted = bool inserted =
service_worker_clients_[version_id].insert(client_uuid).second; service_worker_clients_[version_id].insert(client_uuid).second;
if (!inserted) { if (!inserted) {
base::debug::DumpWithoutCrashing(); NOTREACHED();
return; return;
} }
...@@ -292,13 +291,13 @@ void ServiceWorkerContextAdapter::OnControlleeRemoved( ...@@ -292,13 +291,13 @@ void ServiceWorkerContextAdapter::OnControlleeRemoved(
// notification is dropped. // notification is dropped.
auto it = service_worker_clients_.find(version_id); auto it = service_worker_clients_.find(version_id);
if (it == service_worker_clients_.end()) { if (it == service_worker_clients_.end()) {
base::debug::DumpWithoutCrashing(); NOTREACHED();
return; return;
} }
size_t removed = it->second.erase(client_uuid); size_t removed = it->second.erase(client_uuid);
if (!removed) { if (!removed) {
base::debug::DumpWithoutCrashing(); NOTREACHED();
return; return;
} }
...@@ -325,12 +324,12 @@ void ServiceWorkerContextAdapter::OnControlleeNavigationCommitted( ...@@ -325,12 +324,12 @@ void ServiceWorkerContextAdapter::OnControlleeNavigationCommitted(
// not already a client of |version_id|. // not already a client of |version_id|.
auto it = service_worker_clients_.find(version_id); auto it = service_worker_clients_.find(version_id);
if (it == service_worker_clients_.end()) { if (it == service_worker_clients_.end()) {
base::debug::DumpWithoutCrashing(); NOTREACHED();
return; return;
} }
if (it->second.find(client_uuid) == it->second.end()) { if (it->second.find(client_uuid) == it->second.end()) {
base::debug::DumpWithoutCrashing(); NOTREACHED();
return; return;
} }
......
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