Add TestBrowserThreadBundle into RenderViewHostTestHarness. Kill some unnecessary real threads.

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 "base/files/file_path.h"
 #include "base/message_loop.h"
 #include "chrome/browser/safe_browsing/local_two_phase_testserver.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/test_utils.h"
 #include "net/base/net_errors.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 using content::MessageLoopRunner;
 
 namespace {
@@ skipping 31 matching lines @@
   file_path = file_path.Append(FILE_PATH_LITERAL("url_request_unittest"));
   file_path = file_path.Append(FILE_PATH_LITERAL("BullRunSpeech.txt"));
   return file_path;
 }
 
 }  // namespace
 
 class TwoPhaseUploaderTest : public testing::Test {
  public:
   TwoPhaseUploaderTest()
-      : db_thread_(BrowserThread::DB),
-        io_thread_(BrowserThread::IO, &message_loop_),
+      : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
         url_request_context_getter_(new net::TestURLRequestContextGetter(
             BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO))) {
   }
 
-  virtual void SetUp() {
-    db_thread_.Start();
-  }
-
  protected:
-  base::MessageLoopForIO message_loop_;
-  content::TestBrowserThread db_thread_;
-  content::TestBrowserThread io_thread_;
+  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;
   scoped_ptr<TwoPhaseUploader> uploader(TwoPhaseUploader::Create(
@@ skipping 101 matching lines @@
       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_);
 }