Add TestBrowserThreadBundle into RenderViewHostTestHarness. Kill some unnecessary real threads.

chrome/browser/chromeos/drive/drive_file_stream_reader_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/chromeos/drive/drive_file_stream_reader.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop.h"
 #include "base/rand_util.h"
 #include "base/sequenced_task_runner.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/chromeos/drive/fake_file_system.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/drive/local_file_reader.h"
 #include "chrome/browser/chromeos/drive/test_util.h"
 #include "chrome/browser/google_apis/fake_drive_service.h"
 #include "chrome/browser/google_apis/task_util.h"
 #include "chrome/browser/google_apis/test_util.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
 #include "net/http/http_byte_range.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 
 namespace drive {
 namespace internal {
 namespace {
 
 // Increments the |num_called|, when this method is invoked.
 void IncrementCallback(int* num_called) {
   DCHECK(num_called);
   ++*num_called;
 }
 
 }  // namespace
 
 class LocalReaderProxyTest : public ::testing::Test {
  protected:
-  LocalReaderProxyTest() : io_thread_(BrowserThread::IO, &message_loop_) {
+  LocalReaderProxyTest() : thread_bundle_(IO_MAINLOOP) {
   }
 
   virtual void SetUp() OVERRIDE {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     ASSERT_TRUE(google_apis::test_util::CreateFileOfSpecifiedSize(
         temp_dir_.path(), 1024, &file_path_, &file_content_));
 
     worker_thread_.reset(new base::Thread("ReaderProxyTest"));
     ASSERT_TRUE(worker_thread_->Start());
   }
 
   virtual void TearDown() OVERRIDE {
     worker_thread_.reset();
   }
 
-  base::MessageLoopForIO message_loop_;
-  content::TestBrowserThread io_thread_;
+  content::TestBrowserThreadBundle thread_bundle_;
 
   base::ScopedTempDir temp_dir_;
   base::FilePath file_path_;
   std::string file_content_;
 
   scoped_ptr<base::Thread> worker_thread_;
 };
 
 TEST_F(LocalReaderProxyTest, Read) {
   // Open the file first.
@@ skipping 28 matching lines @@
   LocalReaderProxy proxy(file_reader.Pass(), expected_content.size());
 
   // Make sure the read contant is as same as the file.
   std::string content;
   ASSERT_EQ(net::OK, test_util::ReadAllData(&proxy, &content));
   EXPECT_EQ(expected_content, content);
 }
 
 class NetworkReaderProxyTest : public ::testing::Test {
  protected:
-  NetworkReaderProxyTest() : io_thread_(BrowserThread::IO, &message_loop_) {
+  NetworkReaderProxyTest() : thread_bundle_(IO_MAINLOOP) {
   }
 
-  base::MessageLoopForIO message_loop_;
-  content::TestBrowserThread io_thread_;
+  content::TestBrowserThreadBundle thread_bundle_;
 };
 
 TEST_F(NetworkReaderProxyTest, EmptyFile) {
   NetworkReaderProxy proxy(0, 0, base::Bind(&base::DoNothing));
 
   net::TestCompletionCallback callback;
   const int kBufferSize = 10;
   scoped_refptr<net::IOBuffer> buffer(new net::IOBuffer(kBufferSize));
   int result = proxy.Read(buffer.get(), kBufferSize, callback.callback());
 
@@ skipping 154 matching lines @@
     // Destroy the instance before the network operation is completed.
     // The cancelling callback should be called.
   }
   EXPECT_EQ(1, num_called);
 }
 
 }  // namespace internal
 
 class DriveFileStreamReaderTest : public ::testing::Test {
  protected:
-  DriveFileStreamReaderTest()
-      : ui_thread_(BrowserThread::UI),
-        io_thread_(BrowserThread::IO, &message_loop_) {
+  DriveFileStreamReaderTest() : thread_bundle_(IO_MAINLOOP) {
   }
 
   virtual void SetUp() OVERRIDE {
-    ui_thread_.Start();
-
     worker_thread_.reset(new base::Thread("DriveFileStreamReaderTest"));
     ASSERT_TRUE(worker_thread_->Start());
 
-    BrowserThread::PostTaskAndReply(
-        BrowserThread::UI,
-        FROM_HERE,
-        base::Bind(&DriveFileStreamReaderTest::SetUpOnUIThread,
-                   base::Unretained(this)),
-        base::MessageLoop::QuitClosure());
-    message_loop_.Run();
-  }
-
-  virtual void TearDown() OVERRIDE {
-    BrowserThread::PostTaskAndReply(
-        BrowserThread::UI,
-        FROM_HERE,
-        base::Bind(&DriveFileStreamReaderTest::TearDownOnUIThread,
-                   base::Unretained(this)),
-        base::MessageLoop::QuitClosure());
-    message_loop_.Run();
-
-    worker_thread_.reset();
-  }
-
-  void SetUpOnUIThread() {
     // Initialize FakeDriveService.
     fake_drive_service_.reset(new google_apis::FakeDriveService);
     fake_drive_service_->LoadResourceListForWapi(
         "chromeos/gdata/root_feed.json");
     fake_drive_service_->LoadAccountMetadataForWapi(
         "chromeos/gdata/account_metadata.json");
 
     // Create a testee instance.
     fake_file_system_.reset(
         new test_util::FakeFileSystem(fake_drive_service_.get()));
     fake_file_system_->Initialize();
   }
 
-  void TearDownOnUIThread() {
+  virtual void TearDown() OVERRIDE {
     fake_file_system_.reset();
     fake_drive_service_.reset();
+
+    worker_thread_.reset();
   }
 
   FileSystemInterface* GetFileSystem() {
     return fake_file_system_.get();
   }
 
   DriveFileStreamReader::FileSystemGetter GetFileSystemGetter() {
     return base::Bind(&DriveFileStreamReaderTest::GetFileSystem,
                       base::Unretained(this));
   }
 
-  base::MessageLoopForIO message_loop_;
-  content::TestBrowserThread ui_thread_;
-  content::TestBrowserThread io_thread_;
+  content::TestBrowserThreadBundle thread_bundle_;
 
   scoped_ptr<base::Thread> worker_thread_;
 
   scoped_ptr<google_apis::FakeDriveService> fake_drive_service_;
   scoped_ptr<test_util::FakeFileSystem> fake_file_system_;
 };
 
 TEST_F(DriveFileStreamReaderTest, Read) {
   const base::FilePath kDriveFile =
       util::GetDriveMyDriveRootPath().AppendASCII("File 1.txt");
@@ skipping 149 matching lines @@
       google_apis::CreateComposedCallback(
           base::Bind(&google_apis::test_util::RunAndQuit),
                      google_apis::test_util::CreateCopyResultCallback(
                          &error, &entry)));
   message_loop_.Run();
   EXPECT_EQ(net::ERR_REQUEST_RANGE_NOT_SATISFIABLE, error);
   EXPECT_FALSE(entry);
 }
 
 }  // namespace drive