Merge 21668 - Make AutomationProxyTest.NavigateToURLWithTimeout* tests notfla...

chrome/browser/automation/automation_provider.cc

Index: chrome/browser/automation/automation_provider.cc
===================================================================
--- chrome/browser/automation/automation_provider.cc	(revision 23129)
+++ chrome/browser/automation/automation_provider.cc	(working copy)
@@ -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"
@@ -2141,6 +2142,7 @@
       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();
Property changes on: chrome\browser\automation\automation_provider.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/automation/automation_provider.cc:r21668