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

chrome/browser/automation/automation_provider.cc

 // Copyright (c) 2006-2009 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.
 
 #include "chrome/browser/automation/automation_provider.h"
 
 #include "app/l10n_util.h"
 #include "app/message_box_flags.h"
 #include "base/file_version_info.h"
 #include "base/json_reader.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "base/values.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/app_modal_dialog.h"
 #include "chrome/browser/app_modal_dialog_queue.h"
 #include "chrome/browser/automation/automation_extension_function.h"
 #include "chrome/browser/automation/automation_provider_list.h"
 #include "chrome/browser/automation/extension_automation_constants.h"
 #include "chrome/browser/automation/extension_port_container.h"
 #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"
 #include "chrome/browser/dom_operation_notification_details.h"
 #include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/find_bar.h"
 #include "chrome/browser/find_bar_controller.h"
@@ skipping 2097 matching lines @@
   virtual void Run() {
     if (enabled_) {
       URLRequestFilter::GetInstance()->ClearHandlers();
 
       URLRequestFailedDnsJob::AddUITestUrls();
       URLRequestSlowDownloadJob::AddUITestUrls();
 
       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();
     }
   }
  private:
   bool enabled_;
 };
 
 void AutomationProvider::SetFilteredInet(const IPC::Message& message,
@@ skipping 897 matching lines @@
         if (container) {
           *count = static_cast<int>(container->GetBlockedPopupCount());
         } else {
           // If we don't have a container, we don't have any blocked popups to
           // contain!
           *count = 0;
         }
       }
   }
 }