Remove all remaining traces of MessageLoopProxy.

chrome/browser/safe_browsing/two_phase_uploader_unittest.cc

 // Copyright 2013 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/safe_browsing/two_phase_uploader.h"
 
 #include <stdint.h>
 
 #include "base/files/file_path.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 47 matching lines @@
   return file_path;
 }
 
 }  // namespace
 
 class TwoPhaseUploaderTest : public testing::Test {
  public:
   TwoPhaseUploaderTest()
       : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
         url_request_context_getter_(new net::TestURLRequestContextGetter(
-            BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO))) {
-  }
+            BrowserThread::GetTaskRunnerForThread(BrowserThread::IO))) {}
 
  protected:
   content::TestBrowserThreadBundle thread_bundle_;
 
   scoped_refptr<net::TestURLRequestContextGetter> url_request_context_getter_;
 };
 
 TEST_F(TwoPhaseUploaderTest, UploadFile) {
   scoped_refptr<MessageLoopRunner> runner = new MessageLoopRunner;
   LocalTwoPhaseTestServer test_server;
   ASSERT_TRUE(test_server.Start());
   Delegate delegate;
   std::unique_ptr<TwoPhaseUploader> uploader(TwoPhaseUploader::Create(
       url_request_context_getter_.get(),
-      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB).get(),
+      BrowserThread::GetTaskRunnerForThread(BrowserThread::DB).get(),
       test_server.GetURL("start"), "metadata", GetTestFilePath(),
       base::Bind(&Delegate::ProgressCallback, base::Unretained(&delegate)),
       base::Bind(&Delegate::FinishCallback, base::Unretained(&delegate),
                  runner)));
   uploader->Start();
   runner->Run();
   EXPECT_EQ(TwoPhaseUploader::STATE_SUCCESS, delegate.state_);
   EXPECT_EQ(net::OK, delegate.net_error_);
   EXPECT_EQ(200, delegate.response_code_);
   EXPECT_EQ(
       "/start\n"                                     // path of start request
       "4c24b2612e94e2ae622e54397663f2b7bf0a2e17\n"   // sha1sum of "metadata"
       "944857cc626f2cafe232521986b4c6d3f9993c97\n",  // sha1sum of test file
       delegate.response_);
 }
 
 TEST_F(TwoPhaseUploaderTest, BadPhaseOneResponse) {
   scoped_refptr<MessageLoopRunner> runner = new MessageLoopRunner;
   LocalTwoPhaseTestServer test_server;
   ASSERT_TRUE(test_server.Start());
   Delegate delegate;
   std::unique_ptr<TwoPhaseUploader> uploader(TwoPhaseUploader::Create(
       url_request_context_getter_.get(),
-      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB).get(),
+      BrowserThread::GetTaskRunnerForThread(BrowserThread::DB).get(),
       test_server.GetURL("start?p1code=500"), "metadata", GetTestFilePath(),
       base::Bind(&Delegate::ProgressCallback, base::Unretained(&delegate)),
       base::Bind(&Delegate::FinishCallback, base::Unretained(&delegate),
                  runner)));
   uploader->Start();
   runner->Run();
   EXPECT_EQ(TwoPhaseUploader::UPLOAD_METADATA, delegate.state_);
   EXPECT_EQ(net::OK, delegate.net_error_);
   EXPECT_EQ(500, delegate.response_code_);
   EXPECT_EQ("", delegate.response_);
 }
 
 TEST_F(TwoPhaseUploaderTest, BadPhaseTwoResponse) {
   scoped_refptr<MessageLoopRunner> runner = new MessageLoopRunner;
   LocalTwoPhaseTestServer test_server;
   ASSERT_TRUE(test_server.Start());
   Delegate delegate;
   std::unique_ptr<TwoPhaseUploader> uploader(TwoPhaseUploader::Create(
       url_request_context_getter_.get(),
-      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB).get(),
+      BrowserThread::GetTaskRunnerForThread(BrowserThread::DB).get(),
       test_server.GetURL("start?p2code=500"), "metadata", GetTestFilePath(),
       base::Bind(&Delegate::ProgressCallback, base::Unretained(&delegate)),
       base::Bind(&Delegate::FinishCallback, base::Unretained(&delegate),
                  runner)));
   uploader->Start();
   runner->Run();
   EXPECT_EQ(TwoPhaseUploader::UPLOAD_FILE, delegate.state_);
   EXPECT_EQ(net::OK, delegate.net_error_);
   EXPECT_EQ(500, delegate.response_code_);
   EXPECT_EQ(
       "/start\n"                                     // path of start request
       "4c24b2612e94e2ae622e54397663f2b7bf0a2e17\n"   // sha1sum of "metadata"
       "944857cc626f2cafe232521986b4c6d3f9993c97\n",  // sha1sum of test file
       delegate.response_);
 }
 
 TEST_F(TwoPhaseUploaderTest, PhaseOneConnectionClosed) {
   scoped_refptr<MessageLoopRunner> runner = new MessageLoopRunner;
   LocalTwoPhaseTestServer test_server;
   ASSERT_TRUE(test_server.Start());
   Delegate delegate;
   std::unique_ptr<TwoPhaseUploader> uploader(TwoPhaseUploader::Create(
       url_request_context_getter_.get(),
-      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB).get(),
+      BrowserThread::GetTaskRunnerForThread(BrowserThread::DB).get(),
       test_server.GetURL("start?p1close=1"), "metadata", GetTestFilePath(),
       base::Bind(&Delegate::ProgressCallback, base::Unretained(&delegate)),
       base::Bind(&Delegate::FinishCallback, base::Unretained(&delegate),
                  runner)));
   uploader->Start();
   runner->Run();
   EXPECT_EQ(TwoPhaseUploader::UPLOAD_METADATA, delegate.state_);
   EXPECT_EQ(net::ERR_EMPTY_RESPONSE, delegate.net_error_);
   EXPECT_EQ(net::URLFetcher::RESPONSE_CODE_INVALID, delegate.response_code_);
   EXPECT_EQ("", delegate.response_);
 }
 
 TEST_F(TwoPhaseUploaderTest, PhaseTwoConnectionClosed) {
   scoped_refptr<MessageLoopRunner> runner = new MessageLoopRunner;
   LocalTwoPhaseTestServer test_server;
   ASSERT_TRUE(test_server.Start());
   Delegate delegate;
   std::unique_ptr<TwoPhaseUploader> uploader(TwoPhaseUploader::Create(
       url_request_context_getter_.get(),
-      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB).get(),
+      BrowserThread::GetTaskRunnerForThread(BrowserThread::DB).get(),
       test_server.GetURL("start?p2close=1"), "metadata", GetTestFilePath(),
       base::Bind(&Delegate::ProgressCallback, base::Unretained(&delegate)),
       base::Bind(&Delegate::FinishCallback, base::Unretained(&delegate),
                  runner)));
   uploader->Start();
   runner->Run();
   EXPECT_EQ(TwoPhaseUploader::UPLOAD_FILE, delegate.state_);
   EXPECT_EQ(net::ERR_EMPTY_RESPONSE, delegate.net_error_);
   EXPECT_EQ(net::URLFetcher::RESPONSE_CODE_INVALID, delegate.response_code_);
   EXPECT_EQ("", delegate.response_);
 }
 
 }  // namespace safe_browsing