Cancel javascript: URL navigations if the frame was navigated.

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 2551ef6b5faf96a86b2e0d95272c7dec5c137b25..71a64fb78ac2cc4a15124a6d2a7d82f24a689373 100644
--- a/third_party/WebKit/Source/core/loader/NavigationScheduler.h
+++ b/third_party/WebKit/Source/core/loader/NavigationScheduler.h
@@ -75,13 +75,8 @@ public:
     DECLARE_TRACE();
 
 private:
-    friend class FrameNavigationDisabler;
     explicit NavigationScheduler(LocalFrame*);
 
-    void disableFrameNavigation() { ++m_navigationDisableCount; }
-    void enableFrameNavigation() { --m_navigationDisableCount; }
-    bool isFrameNavigationAllowed() const { return !m_navigationDisableCount; }
-
     bool shouldScheduleReload() const;
     bool shouldScheduleNavigation(const String& url) const;
 
@@ -93,7 +88,6 @@ private:
     RawPtrWillBeMember<LocalFrame> m_frame;
     OwnPtr<CancellableTaskFactory> m_navigateTaskFactory;
     OwnPtrWillBeMember<ScheduledNavigation> m_redirect;
-    int m_navigationDisableCount;
 };
 
 class NavigationDisablerForBeforeUnload {
@@ -115,17 +109,6 @@ private:
     static unsigned s_navigationDisableCount;
 };
 
-class FrameNavigationDisabler {
-    WTF_MAKE_NONCOPYABLE(FrameNavigationDisabler);
-    STACK_ALLOCATED();
-public:
-    explicit FrameNavigationDisabler(LocalFrame*);
-    ~FrameNavigationDisabler();
-
-private:
-    RawPtrWillBeMember<NavigationScheduler> m_navigationScheduler;
-};
-
 } // namespace blink
 
 #endif // NavigationScheduler_h