Add 'waitUntilExternalURLLoad' method to TestRunner.

content/shell/renderer/test_runner/WebFrameTestProxy.h

 // Copyright 2013 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.
 
 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBFRAMETESTPROXY_H_
 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBFRAMETESTPROXY_H_
 
 #include "base/basictypes.h"
 #include "content/shell/renderer/test_runner/WebTestProxy.h"
 #include "third_party/WebKit/public/platform/WebString.h"
@@ skipping 24 matching lines @@
 
     blink::WebPlugin* createPlugin(blink::WebFrame* frame, const blink::WebPluginParams& params)
     {
         blink::WebPlugin* plugin = m_baseProxy->createPlugin(frame, params);
         if (plugin)
             return plugin;
         return Base::createPlugin(frame, params);
     }
 
     // WebFrameClient implementation.
-    virtual bool canCreatePluginWithoutRenderer(const blink::WebString& mimeType)
+    virtual void loadURLExternally(blink::WebFrame* frame, const blink::WebURLRequest& request, blink::WebNavigationPolicy policy, const blink::WebString& suggested_name) OVERRIDE
     {
-        using blink::WebString;
-
-        const CR_DEFINE_STATIC_LOCAL(WebString, suffix, ("-can-create-without-renderer"));
-        return mimeType.utf8().find(suffix.utf8()) != std::string::npos;
+        m_baseProxy->loadURLExternally(frame, request, policy, suggested_name);
+        Base::loadURLExternally(frame, request, policy, suggested_name);
     }
-    virtual void didStartProvisionalLoad(blink::WebFrame* frame)
+    virtual void didStartProvisionalLoad(blink::WebFrame* frame) OVERRIDE

[jochen (gone - plz use gerrit), 2014/03/16 12:55:45]

we don't put OVERRIDE on implementations of the blink API, because it makes
refactoring the blink API super painful

     {
         if (m_version > 2)
             m_baseProxy->didStartProvisionalLoad(frame);
         Base::didStartProvisionalLoad(frame);
     }
-    virtual void didReceiveServerRedirectForProvisionalLoad(blink::WebFrame* frame)
+    virtual void didReceiveServerRedirectForProvisionalLoad(blink::WebFrame* frame) OVERRIDE
     {
         m_baseProxy->didReceiveServerRedirectForProvisionalLoad(frame);
         Base::didReceiveServerRedirectForProvisionalLoad(frame);
     }
-    virtual void didFailProvisionalLoad(blink::WebFrame* frame, const blink::WebURLError& error)
+    virtual void didFailProvisionalLoad(blink::WebFrame* frame, const blink::WebURLError& error) OVERRIDE
     {
         Base::didFailProvisionalLoad(frame, error);
     }
-    virtual void didCommitProvisionalLoad(blink::WebFrame* frame, bool isNewNavigation)
+    virtual void didCommitProvisionalLoad(blink::WebFrame* frame, bool isNewNavigation) OVERRIDE
     {
         Base::didCommitProvisionalLoad(frame, isNewNavigation);
     }
-    virtual void didReceiveTitle(blink::WebFrame* frame, const blink::WebString& title, blink::WebTextDirection direction)
+    virtual void didReceiveTitle(blink::WebFrame* frame, const blink::WebString& title, blink::WebTextDirection direction) OVERRIDE
     {
         Base::didReceiveTitle(frame, title, direction);
     }
-    virtual void didChangeIcon(blink::WebFrame* frame, blink::WebIconURL::Type iconType)
+    virtual void didChangeIcon(blink::WebFrame* frame, blink::WebIconURL::Type iconType) OVERRIDE
     {
         Base::didChangeIcon(frame, iconType);
     }
-    virtual void didFinishDocumentLoad(blink::WebFrame* frame)
+    virtual void didFinishDocumentLoad(blink::WebFrame* frame) OVERRIDE
     {
         Base::didFinishDocumentLoad(frame);
     }
-    virtual void didHandleOnloadEvents(blink::WebFrame* frame)
+    virtual void didHandleOnloadEvents(blink::WebFrame* frame) OVERRIDE
     {
         Base::didHandleOnloadEvents(frame);
     }
-    virtual void didFailLoad(blink::WebFrame* frame, const blink::WebURLError& error)
+    virtual void didFailLoad(blink::WebFrame* frame, const blink::WebURLError& error) OVERRIDE
     {
         Base::didFailLoad(frame, error);
     }
-    virtual void didFinishLoad(blink::WebFrame* frame)
+    virtual void didFinishLoad(blink::WebFrame* frame) OVERRIDE
     {
         Base::didFinishLoad(frame);
     }
-    virtual void showContextMenu(const blink::WebContextMenuData& contextMenuData) {
+    virtual void showContextMenu(const blink::WebContextMenuData& contextMenuData) OVERRIDE
+    {
         m_baseProxy->showContextMenu(Base::GetWebFrame(), contextMenuData);
         Base::showContextMenu(contextMenuData);
     }
-    virtual void didDetectXSS(blink::WebFrame* frame, const blink::WebURL& insecureURL, bool didBlockEntirePage)
+    virtual void didDetectXSS(blink::WebFrame* frame, const blink::WebURL& insecureURL, bool didBlockEntirePage) OVERRIDE
     {
         // This is not implemented in RenderFrameImpl, so need to explicitly call
         // into the base proxy.
         m_baseProxy->didDetectXSS(frame, insecureURL, didBlockEntirePage);
         Base::didDetectXSS(frame, insecureURL, didBlockEntirePage);
     }
-    virtual void didDispatchPingLoader(blink::WebFrame* frame, const blink::WebURL& url)
+    virtual void didDispatchPingLoader(blink::WebFrame* frame, const blink::WebURL& url) OVERRIDE
     {
         // This is not implemented in RenderFrameImpl, so need to explicitly call
         // into the base proxy.
         m_baseProxy->didDispatchPingLoader(frame, url);
         Base::didDispatchPingLoader(frame, url);
     }
-    virtual void willRequestResource(blink::WebFrame* frame, const blink::WebCachedURLRequest& request)
+    virtual void willRequestResource(blink::WebFrame* frame, const blink::WebCachedURLRequest& request) OVERRIDE
     {
         // This is not implemented in RenderFrameImpl, so need to explicitly call
         // into the base proxy.
         m_baseProxy->willRequestResource(frame, request);
         Base::willRequestResource(frame, request);
     }
-    virtual void didCreateDataSource(blink::WebFrame* frame, blink::WebDataSource* ds)
+    virtual void didCreateDataSource(blink::WebFrame* frame, blink::WebDataSource* ds) OVERRIDE
     {
         Base::didCreateDataSource(frame, ds);
     }
-    virtual void willSendRequest(blink::WebFrame* frame, unsigned identifier, blink::WebURLRequest& request, const blink::WebURLResponse& redirectResponse)
+    virtual void willSendRequest(blink::WebFrame* frame, unsigned identifier, blink::WebURLRequest& request, const blink::WebURLResponse& redirectResponse) OVERRIDE
     {
         m_baseProxy->willSendRequest(frame, identifier, request, redirectResponse);
         Base::willSendRequest(frame, identifier, request, redirectResponse);
     }
-    virtual void didReceiveResponse(blink::WebFrame* frame, unsigned identifier, const blink::WebURLResponse& response)
+    virtual void didReceiveResponse(blink::WebFrame* frame, unsigned identifier, const blink::WebURLResponse& response) OVERRIDE
     {
         m_baseProxy->didReceiveResponse(frame, identifier, response);
         Base::didReceiveResponse(frame, identifier, response);
     }
-    virtual void didChangeResourcePriority(blink::WebFrame* frame, unsigned identifier, const blink::WebURLRequest::Priority& priority)
+    virtual void didChangeResourcePriority(blink::WebFrame* frame, unsigned identifier, const blink::WebURLRequest::Priority& priority) OVERRIDE
     {
         // This is not implemented in RenderFrameImpl, so need to explicitly call
         // into the base proxy.
         m_baseProxy->didChangeResourcePriority(frame, identifier, priority);
         Base::didChangeResourcePriority(frame, identifier, priority);
     }
-    virtual void didFinishResourceLoad(blink::WebFrame* frame, unsigned identifier)
+    virtual void didFinishResourceLoad(blink::WebFrame* frame, unsigned identifier) OVERRIDE
     {
         Base::didFinishResourceLoad(frame, identifier);
     }
-    virtual blink::WebNavigationPolicy decidePolicyForNavigation(blink::WebFrame* frame, blink::WebDataSource::ExtraData* extraData, const blink::WebURLRequest& request, blink::WebNavigationType type, blink::WebNavigationPolicy defaultPolicy, bool isRedirect)
+    virtual blink::WebNavigationPolicy decidePolicyForNavigation(blink::WebFrame* frame, blink::WebDataSource::ExtraData* extraData, const blink::WebURLRequest& request, blink::WebNavigationType type, blink::WebNavigationPolicy defaultPolicy, bool isRedirect) OVERRIDE
     {
         blink::WebNavigationPolicy policy = m_baseProxy->decidePolicyForNavigation(frame, extraData, request, type, defaultPolicy, isRedirect);
         if (policy == blink::WebNavigationPolicyIgnore)
             return policy;
 
         return Base::decidePolicyForNavigation(frame, extraData, request, type, defaultPolicy, isRedirect);
     }
-    virtual bool willCheckAndDispatchMessageEvent(blink::WebFrame* sourceFrame, blink::WebFrame* targetFrame, blink::WebSecurityOrigin target, blink::WebDOMMessageEvent event)
+    virtual bool willCheckAndDispatchMessageEvent(blink::WebFrame* sourceFrame, blink::WebFrame* targetFrame, blink::WebSecurityOrigin target, blink::WebDOMMessageEvent event) OVERRIDE
     {
         if (m_baseProxy->willCheckAndDispatchMessageEvent(sourceFrame, targetFrame, target, event))
             return true;
         return Base::willCheckAndDispatchMessageEvent(sourceFrame, targetFrame, target, event);
     }
 
 private:
     WebTestProxyBase* m_baseProxy;
 
     // This is used to incrementally change code between Blink and Chromium.
     // It is used instead of a #define and is set by layouttest_support when
     // creating this object.
     int m_version;
 
     DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy);
 };
 
 }
 
 #endif // WebTestProxy_h