Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2519)

Unified Diff: content/shell/renderer/test_runner/test_runner.h

Issue 200663002: Add 'waitUntilExternalURLLoad' method to TestRunner. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove extra whitespace Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/shell/renderer/test_runner/test_runner.h
diff --git a/content/shell/renderer/test_runner/test_runner.h b/content/shell/renderer/test_runner/test_runner.h
index 4514c949ec0d9a7ae500aab3bc5a64c155553daa..330d6457cece192389c576925ca7921faff2a309 100644
--- a/content/shell/renderer/test_runner/test_runner.h
+++ b/content/shell/renderer/test_runner/test_runner.h
@@ -105,6 +105,7 @@ class TestRunner : public ::WebTestRunner::WebTestRunner,
bool shouldDumpProgressFinishedCallback() const;
bool shouldDumpSpellCheckCallbacks() const;
bool shouldStayOnPageAfterHandlingBeforeUnload() const;
+ bool shouldWaitUntilExternalURLLoad() const;
const std::set<std::string>* httpHeadersToClear() const;
void setTopLoadingFrame(blink::WebFrame*, bool);
blink::WebFrame* topLoadingFrame() const;
@@ -443,6 +444,10 @@ class TestRunner : public ::WebTestRunner::WebTestRunner,
// Sets a flag to enable the mock theme.
void SetUseMockTheme(bool use);
+ // Sets a flag that causes the test to be marked as completed when the
+ // WebFrameClient receives a loadURLExternally() call.
+ void WaitUntilExternalURLLoad();
+
///////////////////////////////////////////////////////////////////////////
// Methods interacting with the WebTestProxy
@@ -534,6 +539,10 @@ class TestRunner : public ::WebTestRunner::WebTestRunner,
// If true, don't dump output until notifyDone is called.
bool wait_until_done_;
+ // If true, ends the test when a URL is loaded externally via
+ // WebFrameClient::loadURLExternally().
+ bool wait_until_external_url_load_;
+
// Causes navigation actions just printout the intended navigation instead
// of taking you to the page. This is used for cases like mailto, where you
// don't actually want to open the mail program.
« no previous file with comments | « content/shell/renderer/test_runner/WebTestProxy.cpp ('k') | content/shell/renderer/test_runner/test_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698