Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / net / url_request_mock_util.cc

diff --git a/src/chrome/browser/net/url_request_mock_util.cc b/src/chrome/browser/net/url_request_mock_util.cc
index 6255c60..cd956bb 100644 (file)
--- a/src/chrome/browser/net/url_request_mock_util.cc
+++ b/src/chrome/browser/net/url_request_mock_util.cc
@@ -10,9 +10,9 @@
 #include "base/threading/thread_restrictions.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/test/net/url_request_failed_job.h"
-#include "content/test/net/url_request_mock_http_job.h"
 #include "content/test/net/url_request_slow_download_job.h"
+#include "net/test/url_request/url_request_failed_job.h"
+#include "net/test/url_request/url_request_mock_http_job.h"
 #include "net/url_request/url_request_filter.h"
 
 using content::BrowserThread;
@@ -32,12 +32,13 @@ void SetUrlRequestMocksEnabled(bool enabled) {
 
     net::URLRequestFilter::GetInstance()->ClearHandlers();
 
-    content::URLRequestFailedJob::AddUrlHandler();
+    net::URLRequestFailedJob::AddUrlHandler();
     content::URLRequestSlowDownloadJob::AddUrlHandler();
 
     base::FilePath root_http;
     PathService::Get(chrome::DIR_TEST_DATA, &root_http);
-    content::URLRequestMockHTTPJob::AddUrlHandler(root_http);
+    net::URLRequestMockHTTPJob::AddUrlHandler(root_http,
+                                              BrowserThread::GetBlockingPool());
   } else {
     // Revert to the default handlers.
     net::URLRequestFilter::GetInstance()->ClearHandlers();