Refactor frame navigation/detach state cleanup to be more sane.

Source/web/tests/FrameTestHelpers.h

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 96 matching lines @@
     void waitForLoadToComplete();
 
 private:
     int m_loadsInProgress;
 };
 
 // Minimal implementation of WebRemoteFrameClient needed for unit tests that load remote frames. Tests that load
 // frames and need further specialization of WebFrameClient behavior should subclass this.
 class TestWebRemoteFrameClient : public WebRemoteFrameClient {
 public:
-    // Notifies the embedder that a postMessage was issued to a remote frame.
-    virtual void postMessageEvent(
+    TestWebRemoteFrameClient();
+
+    WebRemoteFrame* frame() const { return m_frame; }
+
+    // WebRemoteFrameClient overrides:
+    void frameDetached() override;
+    void postMessageEvent(
         WebLocalFrame* sourceFrame,
         WebRemoteFrame* targetFrame,
         WebSecurityOrigin targetOrigin,
-        WebDOMMessageEvent) { }
+        WebDOMMessageEvent) override { }
+
+private:
+    WebRemoteFrame* const m_frame;
 };
 
 class TestWebViewClient : public WebViewClient {
 public:
     virtual ~TestWebViewClient() { }
     virtual void initializeLayerTreeView() override;
     virtual WebLayerTreeView* layerTreeView() override { return m_layerTreeView.get(); }
 
 private:
     OwnPtr<WebLayerTreeView> m_layerTreeView;
@@ skipping 12 matching lines @@
     {
         Settings::setMockScrollbarsEnabled(false);
         RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(false);
     }
 };
 
 } // namespace FrameTestHelpers
 } // namespace blink
 
 #endif // FrameTestHelpers_h