Index: content/browser/download/drag_download_file_browsertest.cc |
diff --git a/content/browser/download/drag_download_file_browsertest.cc b/content/browser/download/drag_download_file_browsertest.cc |
index 136fac3cf3259bb9e713f0dd2ae80036cc21e8dc..1f5742b78d1c126ce3430520fe8ab80012afbe83 100644 |
--- a/content/browser/download/drag_download_file_browsertest.cc |
+++ b/content/browser/download/drag_download_file_browsertest.cc |
@@ -21,8 +21,8 @@ |
#include "content/shell/browser/shell.h" |
#include "content/shell/browser/shell_browser_context.h" |
#include "content/shell/browser/shell_download_manager_delegate.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_mock_http_job.h" |
#include "testing/gmock/include/gmock/gmock.h" |
#include "testing/gtest/include/gtest/gtest.h" |
#include "url/gurl.h" |
@@ -74,7 +74,8 @@ class DragDownloadFileTest : public ContentBrowserTest { |
base::FilePath mock_base(GetTestFilePath("download", "")); |
BrowserThread::PostTask( |
BrowserThread::IO, FROM_HERE, |
- base::Bind(&URLRequestMockHTTPJob::AddUrlHandler, mock_base)); |
+ base::Bind(&net::URLRequestMockHTTPJob::AddUrlHandler, mock_base, |
+ content::BrowserThread::GetBlockingPool())); |
} |
const base::FilePath& downloads_directory() const { |
@@ -90,8 +91,8 @@ class DragDownloadFileTest : public ContentBrowserTest { |
IN_PROC_BROWSER_TEST_F(DragDownloadFileTest, DragDownloadFileTest_NetError) { |
base::FilePath name(downloads_directory().AppendASCII( |
"DragDownloadFileTest_NetError.txt")); |
- GURL url(URLRequestMockHTTPJob::GetMockUrl(base::FilePath(FILE_PATH_LITERAL( |
- "download-test.lib")))); |
+ GURL url(net::URLRequestMockHTTPJob::GetMockUrl( |
+ base::FilePath(FILE_PATH_LITERAL("download-test.lib")))); |
Referrer referrer; |
std::string referrer_encoding; |
scoped_refptr<DragDownloadFile> file( |
@@ -110,8 +111,8 @@ IN_PROC_BROWSER_TEST_F(DragDownloadFileTest, DragDownloadFileTest_NetError) { |
IN_PROC_BROWSER_TEST_F(DragDownloadFileTest, DragDownloadFileTest_Complete) { |
base::FilePath name(downloads_directory().AppendASCII( |
"DragDownloadFileTest_Complete.txt")); |
- GURL url(URLRequestMockHTTPJob::GetMockUrl(base::FilePath(FILE_PATH_LITERAL( |
- "download-test.lib")))); |
+ GURL url(net::URLRequestMockHTTPJob::GetMockUrl( |
+ base::FilePath(FILE_PATH_LITERAL("download-test.lib")))); |
Referrer referrer; |
std::string referrer_encoding; |
SetUpServer(); |