Disable navigations in the unload handler.

third_party/WebKit/Source/core/loader/NavigationScheduler.h

Index: third_party/WebKit/Source/core/loader/NavigationScheduler.h
diff --git a/third_party/WebKit/Source/core/loader/NavigationScheduler.h b/third_party/WebKit/Source/core/loader/NavigationScheduler.h
index cc8f867ad94fd39fdb94fce9121e9db99c814a7e..280b1b16b8c64d66a3d50d1924c02d170a579850 100644
--- a/third_party/WebKit/Source/core/loader/NavigationScheduler.h
+++ b/third_party/WebKit/Source/core/loader/NavigationScheduler.h
@@ -90,15 +90,15 @@ private:
     WebScheduler::NavigatingFrameType m_frameType; // Exists because we can't deref m_frame in destructor.
 };
 
-class NavigationDisablerForBeforeUnload {
-    WTF_MAKE_NONCOPYABLE(NavigationDisablerForBeforeUnload);
+class NavigationDisablerForUnload {
+    WTF_MAKE_NONCOPYABLE(NavigationDisablerForUnload);
     STACK_ALLOCATED();
 public:
-    NavigationDisablerForBeforeUnload()
+    NavigationDisablerForUnload()
     {
         s_navigationDisableCount++;
     }
-    ~NavigationDisablerForBeforeUnload()
+    ~NavigationDisablerForUnload()
     {
         ASSERT(s_navigationDisableCount);
         s_navigationDisableCount--;
@@ -109,25 +109,6 @@ private:
     static unsigned s_navigationDisableCount;
 };
 
-class CORE_EXPORT NavigationCounterForUnload {
-    WTF_MAKE_NONCOPYABLE(NavigationCounterForUnload);
-    STACK_ALLOCATED();
-public:
-    NavigationCounterForUnload()
-    {
-        s_inUnloadHandler++;
-    }
-    ~NavigationCounterForUnload()
-    {
-        DCHECK(s_inUnloadHandler);
-        s_inUnloadHandler--;
-    }
-    static bool inUnloadHandler() { return !!s_inUnloadHandler; }
-
-private:
-    static unsigned s_inUnloadHandler;
-};
-
 } // namespace blink
 
 #endif // NavigationScheduler_h