Followup comments from r460581.

content/browser/web_contents/web_contents_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/web_contents/web_contents_impl.h"
 
 #include <stddef.h>
 
 #include <cmath>
 #include <utility>
@@ skipping 1403 matching lines @@
 
 void WebContentsImpl::WasUnOccluded() {
   for (RenderWidgetHostView* view : GetRenderWidgetHostViewsInTree()) {
     if (view)
       view->WasUnOccluded();
   }
 }
 
 bool WebContentsImpl::NeedToFireBeforeUnload() {
   // TODO(creis): Should we fire even for interstitial pages?
+  // TODO(nasko): it's confusing that this method, per comments and tests that
+  // depend on this behavior, needs to check unload handlers as well.
   return WillNotifyDisconnection() && !ShowingInterstitialPage() &&
          !GetRenderViewHost()->SuddenTerminationAllowed() &&
          (GetMainFrame()->ShouldDispatchBeforeUnload() ||
-          GetMainFrame()->ShouldDispatchUnload());
+          GetMainFrame()->HasUnloadHandler());
 }
 
 void WebContentsImpl::DispatchBeforeUnload() {
   bool for_cross_site_transition = false;
   GetMainFrame()->DispatchBeforeUnload(for_cross_site_transition, false);
 }
 
 void WebContentsImpl::AttachToOuterWebContentsFrame(
     WebContents* outer_web_contents,
     RenderFrameHost* outer_contents_frame) {
@@ skipping 3975 matching lines @@
     RenderViewHost* render_view_host = RenderViewHost::From(render_widget_host);
     if (!render_view_host)
       continue;
     render_view_host_set.insert(render_view_host);
   }
   for (RenderViewHost* render_view_host : render_view_host_set)
     render_view_host->OnWebkitPreferencesChanged();
 }
 
 }  // namespace content