diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-27 18:46:33 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-27 18:46:33 +0000 |
| commit | fb9846b4550d2bc633824fcceb0d8ef89674ffc5 (patch) | |
| tree | 830e3730989cb60a292571464d324f9c903765ee /chrome/browser/automation/automation_provider.cc | |
| parent | 43ceffd67ecabba9c9368b16e840f5bf37afac6b (diff) | |
| download | chromium_src-fb9846b4550d2bc633824fcceb0d8ef89674ffc5.zip chromium_src-fb9846b4550d2bc633824fcceb0d8ef89674ffc5.tar.gz chromium_src-fb9846b4550d2bc633824fcceb0d8ef89674ffc5.tar.bz2 | |
Make AutomationProxyTest.NavigateToURLWithTimeout* tests not-flaky.
I used a mock url request job which is guaranteed to finish after the timeout the test uses.
TEST=none
http://crbug.com/16462
Review URL: http://codereview.chromium.org/155941
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21668 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation/automation_provider.cc')
| -rw-r--r-- | chrome/browser/automation/automation_provider.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index 1ce2c87..2f74d23 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -24,6 +24,7 @@ #include "chrome/browser/automation/url_request_failed_dns_job.h" #include "chrome/browser/automation/url_request_mock_http_job.h" #include "chrome/browser/automation/url_request_slow_download_job.h" +#include "chrome/browser/automation/url_request_slow_http_job.h" #include "chrome/browser/blocked_popup_container.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_window.h" @@ -2120,6 +2121,7 @@ class SetFilteredInetTask : public Task { std::wstring root_http; PathService::Get(chrome::DIR_TEST_DATA, &root_http); URLRequestMockHTTPJob::AddUITestUrls(root_http); + URLRequestSlowHTTPJob::AddUITestUrls(root_http); } else { // Revert to the default handlers. URLRequestFilter::GetInstance()->ClearHandlers(); |