[WIP] Call WebTestProxyBase::CheckDone() in didStopLoading()

third_party/WebKit/Source/web/tests/WebFrameTest.cpp

 /*
  * Copyright (C) 2010 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 5869 matching lines @@
         , m_willSendRequestCallCount(0)
         , m_childFrameCreationCount(0)
     {
     }
 
     void setChildWebFrameClient(TestCachePolicyWebFrameClient* client) { m_childClient = client; }
     WebURLRequest::CachePolicy cachePolicy() const { return m_policy; }
     int willSendRequestCallCount() const { return m_willSendRequestCallCount; }
     int childFrameCreationCount() const { return m_childFrameCreationCount; }
 
-    virtual WebFrame* createChildFrame(WebLocalFrame* parent, WebTreeScopeType scope, const WebString&, WebSandboxFlags, const WebFrameOwnerProperties& frameOwnerProperties)
+    WebFrame* createChildFrame(WebLocalFrame* parent, WebTreeScopeType scope, const WebString&, WebSandboxFlags, const WebFrameOwnerProperties& frameOwnerProperties) override
     {
         ASSERT(m_childClient);
         m_childFrameCreationCount++;
         WebFrame* frame = WebLocalFrame::create(scope, m_childClient);
         parent->appendChild(frame);
         return frame;
     }
 
-    virtual void didStartLoading(bool toDifferentDocument)
+    void didStartLoading(bool toDifferentDocument) override
     {
         if (m_parentClient) {
             m_parentClient->didStartLoading(toDifferentDocument);
             return;
         }
         TestWebFrameClient::didStartLoading(toDifferentDocument);
     }
 
-    virtual void didStopLoading()
+    void didStopLoading(WebLocalFrame* frame) override
     {
         if (m_parentClient) {
-            m_parentClient->didStopLoading();
+            m_parentClient->didStopLoading(frame);
             return;
         }
-        TestWebFrameClient::didStopLoading();
+        TestWebFrameClient::didStopLoading(frame);
     }
 
     void willSendRequest(WebLocalFrame* frame, unsigned, WebURLRequest& request, const WebURLResponse&) override
     {
         m_policy = request.cachePolicy();
         m_willSendRequestCallCount++;
     }
 
 private:
     TestCachePolicyWebFrameClient* m_parentClient;
@@ skipping 33 matching lines @@
     EXPECT_EQ(childClient.cachePolicy(), WebURLRequest::ReloadIgnoringCacheData);
 }
 
 class TestSameDocumentWebFrameClient : public FrameTestHelpers::TestWebFrameClient {
 public:
     TestSameDocumentWebFrameClient()
         : m_frameLoadTypeSameSeen(false)
     {
     }
 
-    virtual void willSendRequest(WebLocalFrame* frame, unsigned, WebURLRequest&, const WebURLResponse&)
+    void willSendRequest(WebLocalFrame* frame, unsigned, WebURLRequest&, const WebURLResponse&) override
     {
         if (toWebLocalFrameImpl(frame)->frame()->loader().loadType() == FrameLoadTypeSame)
             m_frameLoadTypeSameSeen = true;
     }
 
     bool frameLoadTypeSameSeen() const { return m_frameLoadTypeSameSeen; }
 
 private:
     bool m_frameLoadTypeSameSeen;
 };
@@ skipping 13 matching lines @@
     EXPECT_TRUE(client.frameLoadTypeSameSeen());
 }
 
 class TestSameDocumentWithImageWebFrameClient : public FrameTestHelpers::TestWebFrameClient {
 public:
     TestSameDocumentWithImageWebFrameClient()
         : m_numOfImageRequests(0)
     {
     }
 
-    virtual void willSendRequest(WebLocalFrame* frame, unsigned, WebURLRequest& request, const WebURLResponse&)
+    void willSendRequest(WebLocalFrame* frame, unsigned, WebURLRequest& request, const WebURLResponse&) override
     {
         if (request.requestContext() == WebURLRequest::RequestContextImage) {
             m_numOfImageRequests++;
             EXPECT_EQ(WebURLRequest::UseProtocolCachePolicy, request.cachePolicy());
         }
     }
 
     int numOfImageRequests() const { return m_numOfImageRequests; }
 
 private:
@@ skipping 50 matching lines @@
     }
 
     void didStartLoading(bool toDifferentDocument) override
     {
         TestWebFrameClient::didStartLoading(toDifferentDocument);
         m_startLoadingCount++;
         if (toDifferentDocument)
             m_differentDocumentStartCount++;
     }
 
-    void didStopLoading() override
+    void didStopLoading(WebLocalFrame* frame) override
     {
-        TestWebFrameClient::didStopLoading();
+        TestWebFrameClient::didStopLoading(frame);
         m_stopLoadingCount++;
     }
 
     int startLoadingCount() const { return m_startLoadingCount; }
     int stopLoadingCount() const { return m_stopLoadingCount; }
     int differentDocumentStartCount() const { return m_differentDocumentStartCount; }
 
 private:
     int m_startLoadingCount;
     int m_stopLoadingCount;
@@ skipping 796 matching lines @@
     {
         m_didNotify = false;
     }
 
     bool didNotify() const
     {
         return m_didNotify;
     }
 
 private:
-    virtual void didChangeThemeColor()
+    void didChangeThemeColor() override
     {
         m_didNotify = true;
     }
 
     bool m_didNotify;
 };
 
 TEST_P(ParameterizedWebFrameTest, ThemeColor)
 {
     registerMockedHttpURLLoad("theme_color_test.html");
@@ skipping 867 matching lines @@
     view->setMainFrame(remoteClient.frame());
     FrameTestHelpers::TestWebRemoteFrameClient childFrameClient;
     WebRemoteFrame* childFrame = view->mainFrame()->toWebRemoteFrame()->createRemoteChild(WebTreeScopeType::Document, "", WebSandboxFlags::None, &childFrameClient);
     childFrame->detach();
     view->close();
     childFrame->close();
 }
 
 class TestConsoleMessageWebFrameClient : public FrameTestHelpers::TestWebFrameClient {
 public:
-    virtual void didAddMessageToConsole(const WebConsoleMessage& message, const WebString& sourceName, unsigned sourceLine, const WebString& stackTrace)
+    void didAddMessageToConsole(const WebConsoleMessage& message, const WebString& sourceName, unsigned sourceLine, const WebString& stackTrace) override
     {
         messages.append(message);
     }
 
     Vector<WebConsoleMessage> messages;
 };
 
 TEST_P(ParameterizedWebFrameTest, CrossDomainAccessErrorsUseCallingWindow)
 {
     registerMockedHttpURLLoad("hidden_frames.html");
@@ skipping 528 matching lines @@
     void didStartLoading(bool toDifferentDocument) override
     {
         EXPECT_EQ(0, m_callbackCount++);
         FrameTestHelpers::TestWebFrameClient::didStartLoading(toDifferentDocument);
     }
     void didStartProvisionalLoad(WebLocalFrame*, double) override { EXPECT_EQ(1, m_callbackCount++); }
     void didCommitProvisionalLoad(WebLocalFrame*, const WebHistoryItem&, WebHistoryCommitType) override { EXPECT_EQ(2, m_callbackCount++); }
     void didFinishDocumentLoad(WebLocalFrame*, bool documentIsEmpty) override { EXPECT_EQ(3, m_callbackCount++); }
     void didHandleOnloadEvents(WebLocalFrame*) override { EXPECT_EQ(4, m_callbackCount++); }
     void didFinishLoad(WebLocalFrame*) override { EXPECT_EQ(5, m_callbackCount++); }
-    void didStopLoading() override
+    void didStopLoading(WebLocalFrame* frame) override
     {
         EXPECT_EQ(6, m_callbackCount++);
-        FrameTestHelpers::TestWebFrameClient::didStopLoading();
+        FrameTestHelpers::TestWebFrameClient::didStopLoading(frame);
     }
 
 private:
     int m_callbackCount;
 };
 
 TEST_F(WebFrameTest, CallbackOrdering)
 {
     registerMockedHttpURLLoad("foo.html");
     FrameTestHelpers::WebViewHelper webViewHelper;
@@ skipping 64 matching lines @@
 }
 
 TEST_F(WebFrameVisibilityChangeTest, RemoteFrameParentVisibilityChange)
 {
     swapLocalFrameToRemoteFrame();
     executeScriptOnMainFrame(WebScriptSource("document.querySelector('iframe').parentElement.style.display = 'none';"));
     EXPECT_FALSE(remoteFrameClient()->isVisible());
 }
 
 } // namespace blink