| Index: content/browser/frame_host/render_frame_host_manager.cc
|
| diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
|
| index cbcbedc796cbb0c12ad14f5812b10543cae701bd..ef68d60497352ec25fffd3366f179866025fc398 100644
|
| --- a/content/browser/frame_host/render_frame_host_manager.cc
|
| +++ b/content/browser/frame_host/render_frame_host_manager.cc
|
| @@ -1013,10 +1013,14 @@ void RenderFrameHostManager::CommitPending() {
|
| // |pending_web_ui_|, or clear |web_ui_| if there is no pending WebUI, or
|
| // leave |web_ui_| as is if reusing it.
|
| DCHECK(!(pending_web_ui_.get() && pending_and_current_web_ui_.get()));
|
| - if (pending_web_ui_)
|
| + if (pending_web_ui_) {
|
| web_ui_.reset(pending_web_ui_.release());
|
| - else if (!pending_and_current_web_ui_.get())
|
| + } else if (!pending_and_current_web_ui_.get()) {
|
| web_ui_.reset();
|
| + } else {
|
| + DCHECK_EQ(pending_and_current_web_ui_.get(), web_ui_.get());
|
| + pending_and_current_web_ui_.reset();
|
| + }
|
|
|
| // It's possible for the pending_render_frame_host_ to be NULL when we aren't
|
| // crossing process boundaries. If so, we just needed to handle the Web UI
|
|
|