Index: chrome/browser/safe_browsing/two_phase_uploader_unittest.cc |
diff --git a/chrome/browser/safe_browsing/two_phase_uploader_unittest.cc b/chrome/browser/safe_browsing/two_phase_uploader_unittest.cc |
index cf556c39d526b4ef83dcd9e546453fe7b794f703..c6f39906a64510267c52a56b254b647e0c0dfa7a 100644 |
--- a/chrome/browser/safe_browsing/two_phase_uploader_unittest.cc |
+++ b/chrome/browser/safe_browsing/two_phase_uploader_unittest.cc |
@@ -8,6 +8,8 @@ |
#include "base/files/file_path.h" |
#include "base/message_loop/message_loop.h" |
+#include "base/task_scheduler/post_task.h" |
+#include "base/task_scheduler/task_traits.h" |
#include "chrome/browser/safe_browsing/local_two_phase_testserver.h" |
#include "content/public/test/test_browser_thread_bundle.h" |
#include "content/public/test/test_utils.h" |
@@ -72,6 +74,9 @@ class TwoPhaseUploaderTest : public testing::Test { |
content::TestBrowserThreadBundle thread_bundle_; |
scoped_refptr<net::TestURLRequestContextGetter> url_request_context_getter_; |
+ const scoped_refptr<base::SequencedTaskRunner> task_runner_ = |
+ base::CreateSequencedTaskRunnerWithTraits( |
+ {base::MayBlock(), base::TaskPriority::BACKGROUND}); |
}; |
TEST_F(TwoPhaseUploaderTest, UploadFile) { |
@@ -80,8 +85,7 @@ TEST_F(TwoPhaseUploaderTest, UploadFile) { |
ASSERT_TRUE(test_server.Start()); |
Delegate delegate; |
std::unique_ptr<TwoPhaseUploader> uploader(TwoPhaseUploader::Create( |
- url_request_context_getter_.get(), |
- BrowserThread::GetTaskRunnerForThread(BrowserThread::DB).get(), |
+ url_request_context_getter_.get(), task_runner_.get(), |
test_server.GetURL("start"), "metadata", GetTestFilePath(), |
base::Bind(&Delegate::ProgressCallback, base::Unretained(&delegate)), |
base::Bind(&Delegate::FinishCallback, base::Unretained(&delegate), |
@@ -105,8 +109,7 @@ TEST_F(TwoPhaseUploaderTest, BadPhaseOneResponse) { |
ASSERT_TRUE(test_server.Start()); |
Delegate delegate; |
std::unique_ptr<TwoPhaseUploader> uploader(TwoPhaseUploader::Create( |
- url_request_context_getter_.get(), |
- BrowserThread::GetTaskRunnerForThread(BrowserThread::DB).get(), |
+ url_request_context_getter_.get(), task_runner_.get(), |
test_server.GetURL("start?p1code=500"), "metadata", GetTestFilePath(), |
base::Bind(&Delegate::ProgressCallback, base::Unretained(&delegate)), |
base::Bind(&Delegate::FinishCallback, base::Unretained(&delegate), |
@@ -126,8 +129,7 @@ TEST_F(TwoPhaseUploaderTest, BadPhaseTwoResponse) { |
ASSERT_TRUE(test_server.Start()); |
Delegate delegate; |
std::unique_ptr<TwoPhaseUploader> uploader(TwoPhaseUploader::Create( |
- url_request_context_getter_.get(), |
- BrowserThread::GetTaskRunnerForThread(BrowserThread::DB).get(), |
+ url_request_context_getter_.get(), task_runner_.get(), |
test_server.GetURL("start?p2code=500"), "metadata", GetTestFilePath(), |
base::Bind(&Delegate::ProgressCallback, base::Unretained(&delegate)), |
base::Bind(&Delegate::FinishCallback, base::Unretained(&delegate), |
@@ -151,8 +153,7 @@ TEST_F(TwoPhaseUploaderTest, PhaseOneConnectionClosed) { |
ASSERT_TRUE(test_server.Start()); |
Delegate delegate; |
std::unique_ptr<TwoPhaseUploader> uploader(TwoPhaseUploader::Create( |
- url_request_context_getter_.get(), |
- BrowserThread::GetTaskRunnerForThread(BrowserThread::DB).get(), |
+ url_request_context_getter_.get(), task_runner_.get(), |
test_server.GetURL("start?p1close=1"), "metadata", GetTestFilePath(), |
base::Bind(&Delegate::ProgressCallback, base::Unretained(&delegate)), |
base::Bind(&Delegate::FinishCallback, base::Unretained(&delegate), |
@@ -172,8 +173,7 @@ TEST_F(TwoPhaseUploaderTest, PhaseTwoConnectionClosed) { |
ASSERT_TRUE(test_server.Start()); |
Delegate delegate; |
std::unique_ptr<TwoPhaseUploader> uploader(TwoPhaseUploader::Create( |
- url_request_context_getter_.get(), |
- BrowserThread::GetTaskRunnerForThread(BrowserThread::DB).get(), |
+ url_request_context_getter_.get(), task_runner_.get(), |
test_server.GetURL("start?p2close=1"), "metadata", GetTestFilePath(), |
base::Bind(&Delegate::ProgressCallback, base::Unretained(&delegate)), |
base::Bind(&Delegate::FinishCallback, base::Unretained(&delegate), |