| Index: content/browser/devtools/render_frame_devtools_agent_host.cc
|
| diff --git a/content/browser/devtools/render_frame_devtools_agent_host.cc b/content/browser/devtools/render_frame_devtools_agent_host.cc
|
| index 51bdb0810d848a450c4a306ba3631f5ba200e637..e5d64bff2495b7f09f841a5510aeccd5034d340d 100644
|
| --- a/content/browser/devtools/render_frame_devtools_agent_host.cc
|
| +++ b/content/browser/devtools/render_frame_devtools_agent_host.cc
|
| @@ -649,18 +649,17 @@ void RenderFrameDevToolsAgentHost::DidFinishNavigation(
|
| scoped_refptr<RenderFrameDevToolsAgentHost> protect(this);
|
|
|
| if (!IsBrowserSideNavigationEnabled()) {
|
| - if (navigation_handle->IsErrorPage()) {
|
| - if (pending_ &&
|
| - pending_->host() == navigation_handle->GetRenderFrameHost()) {
|
| - DiscardPending();
|
| - }
|
| - } else if (navigation_handle->HasCommitted()) {
|
| + if (navigation_handle->HasCommitted() &&
|
| + !navigation_handle->IsErrorPage()) {
|
| if (pending_ &&
|
| pending_->host() == navigation_handle->GetRenderFrameHost()) {
|
| CommitPending();
|
| }
|
| if (session())
|
| protocol::TargetHandler::FromSession(session())->UpdateServiceWorkers();
|
| + } else if (pending_ &&
|
| + pending_->host() == navigation_handle->GetRenderFrameHost()) {
|
| + DiscardPending();
|
| }
|
| DCHECK(CheckConsistency());
|
| return;
|
|
|