Add TestBrowserThreadBundle into RenderViewHostTestHarness. Kill some unnecessary real threads.

chrome/browser/net/sqlite_server_bound_cert_store_unittest.cc

 // Copyright (c) 2012 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 "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop.h"
 #include "base/run_loop.h"
 #include "base/stl_util.h"
-#include "base/test/thread_test_helper.h"
 #include "chrome/browser/net/sqlite_server_bound_cert_store.h"
 #include "chrome/common/chrome_constants.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/browser/browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "net/base/test_data_directory.h"
 #include "net/test/cert_test_util.h"
 #include "sql/statement.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/browser/quota/mock_special_storage_policy.h"
 
 using content::BrowserThread;
 
 class SQLiteServerBoundCertStoreTest : public testing::Test {
  public:
   SQLiteServerBoundCertStoreTest()
-      : db_thread_(BrowserThread::DB),
-        io_thread_(BrowserThread::IO, &message_loop_) {}
+      : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {}
 
   void Load(
       ScopedVector<net::DefaultServerBoundCertStore::ServerBoundCert>* certs) {
     base::RunLoop run_loop;
     store_->Load(base::Bind(&SQLiteServerBoundCertStoreTest::OnLoaded,
                             base::Unretained(this),
                             &run_loop));
     run_loop.Run();
     certs->swap(certs_);
     certs_.clear();
@@ skipping 33 matching lines @@
     exploded_time.day_of_week = 0;  // Unused.
     exploded_time.day_of_month = 13;
     exploded_time.hour = 2;
     exploded_time.minute = 23;
     exploded_time.second = 45;
     exploded_time.millisecond = 0;
     return base::Time::FromUTCExploded(exploded_time);
   }
 
   virtual void SetUp() {
-    db_thread_.Start();
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     store_ = new SQLiteServerBoundCertStore(
         temp_dir_.path().Append(chrome::kOBCertFilename), NULL);
     ScopedVector<net::DefaultServerBoundCertStore::ServerBoundCert> certs;
     Load(&certs);
     ASSERT_EQ(0u, certs.size());
     // Make sure the store gets written at least once.
     store_->AddServerBoundCert(
         net::DefaultServerBoundCertStore::ServerBoundCert(
             "google.com",
             net::CLIENT_CERT_RSA_SIGN,
             base::Time::FromInternalValue(1),
             base::Time::FromInternalValue(2),
             "a", "b"));
   }
 
-  base::MessageLoopForIO message_loop_;
-  content::TestBrowserThread db_thread_;
-  content::TestBrowserThread io_thread_;
+  content::TestBrowserThreadBundle thread_bundle_;
   base::ScopedTempDir temp_dir_;
   scoped_refptr<SQLiteServerBoundCertStore> store_;
   ScopedVector<net::DefaultServerBoundCertStore::ServerBoundCert> certs_;
 };
 
 // Test if data is stored as expected in the SQLite database.
 TEST_F(SQLiteServerBoundCertStoreTest, TestPersistence) {
   store_->AddServerBoundCert(
       net::DefaultServerBoundCertStore::ServerBoundCert(
           "foo.com",
           net::CLIENT_CERT_ECDSA_SIGN,
           base::Time::FromInternalValue(3),
           base::Time::FromInternalValue(4),
           "c", "d"));
 
   ScopedVector<net::DefaultServerBoundCertStore::ServerBoundCert> certs;
   // Replace the store effectively destroying the current one and forcing it
   // to write its data to disk. Then we can see if after loading it again it
   // is still there.
   store_ = NULL;
-  scoped_refptr<base::ThreadTestHelper> helper(
-      new base::ThreadTestHelper(
-          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB)));
   // Make sure we wait until the destructor has run.
-  ASSERT_TRUE(helper->Run());
+  base::RunLoop().RunUntilIdle();
   store_ = new SQLiteServerBoundCertStore(
       temp_dir_.path().Append(chrome::kOBCertFilename), NULL);
 
   // Reload and test for persistence
   Load(&certs);
   ASSERT_EQ(2U, certs.size());
   net::DefaultServerBoundCertStore::ServerBoundCert* ec_cert;
   net::DefaultServerBoundCertStore::ServerBoundCert* rsa_cert;
   if (net::CLIENT_CERT_RSA_SIGN == certs[0]->type()) {
     rsa_cert = certs[0];
@@ skipping 13 matching lines @@
   ASSERT_STREQ("c", ec_cert->private_key().c_str());
   ASSERT_STREQ("d", ec_cert->cert().c_str());
   ASSERT_EQ(3, ec_cert->creation_time().ToInternalValue());
   ASSERT_EQ(4, ec_cert->expiration_time().ToInternalValue());
 
   // Now delete the cert and check persistence again.
   store_->DeleteServerBoundCert(*certs[0]);
   store_->DeleteServerBoundCert(*certs[1]);
   store_ = NULL;
   // Make sure we wait until the destructor has run.
-  ASSERT_TRUE(helper->Run());
+  base::RunLoop().RunUntilIdle();
   certs.clear();
   store_ = new SQLiteServerBoundCertStore(
       temp_dir_.path().Append(chrome::kOBCertFilename), NULL);
 
   // Reload and check if the cert has been removed.
   Load(&certs);
   ASSERT_EQ(0U, certs.size());
 }
 
 TEST_F(SQLiteServerBoundCertStoreTest, TestUpgradeV1) {
@@ skipping 54 matching lines @@
     ASSERT_EQ(cert_data, certs[0]->cert());
 
     ASSERT_STREQ("foo.com", certs[1]->server_identifier().c_str());
     ASSERT_EQ(net::CLIENT_CERT_RSA_SIGN, certs[1]->type());
     // Undecodable cert, expiration time will be uninitialized.
     ASSERT_EQ(base::Time(), certs[1]->expiration_time());
     ASSERT_STREQ("\xaa", certs[1]->private_key().c_str());
     ASSERT_STREQ("\xbb", certs[1]->cert().c_str());
 
     store_ = NULL;
-    // Make sure we wait until the destructor has run.
-    scoped_refptr<base::ThreadTestHelper> helper(
-        new base::ThreadTestHelper(
-            BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB)));
-    ASSERT_TRUE(helper->Run());
+    base::RunLoop().RunUntilIdle();
 
     // Verify the database version is updated.
     {
       sql::Connection db;
       ASSERT_TRUE(db.Open(v1_db_path));
       sql::Statement smt(db.GetUniqueStatement(
           "SELECT value FROM meta WHERE key = \"version\""));
       ASSERT_TRUE(smt.Step());
       EXPECT_EQ(4, smt.ColumnInt(0));
       EXPECT_FALSE(smt.Step());
@@ skipping 64 matching lines @@
 
     ASSERT_STREQ("foo.com", certs[1]->server_identifier().c_str());
     ASSERT_EQ(net::CLIENT_CERT_ECDSA_SIGN, certs[1]->type());
     // Undecodable cert, expiration time will be uninitialized.
     ASSERT_EQ(base::Time(), certs[1]->expiration_time());
     ASSERT_STREQ("\xaa", certs[1]->private_key().c_str());
     ASSERT_STREQ("\xbb", certs[1]->cert().c_str());
 
     store_ = NULL;
     // Make sure we wait until the destructor has run.
-    scoped_refptr<base::ThreadTestHelper> helper(
-        new base::ThreadTestHelper(
-            BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB)));
-    ASSERT_TRUE(helper->Run());
+    base::RunLoop().RunUntilIdle();
 
     // Verify the database version is updated.
     {
       sql::Connection db;
       ASSERT_TRUE(db.Open(v2_db_path));
       sql::Statement smt(db.GetUniqueStatement(
           "SELECT value FROM meta WHERE key = \"version\""));
       ASSERT_TRUE(smt.Step());
       EXPECT_EQ(4, smt.ColumnInt(0));
       EXPECT_FALSE(smt.Step());
@@ skipping 68 matching lines @@
     ASSERT_STREQ("foo.com", certs[1]->server_identifier().c_str());
     ASSERT_EQ(net::CLIENT_CERT_ECDSA_SIGN, certs[1]->type());
     ASSERT_EQ(2000, certs[1]->expiration_time().ToInternalValue());
     // Undecodable cert, creation time will be uninitialized.
     ASSERT_EQ(base::Time(), certs[1]->creation_time());
     ASSERT_STREQ("\xaa", certs[1]->private_key().c_str());
     ASSERT_STREQ("\xbb", certs[1]->cert().c_str());
 
     store_ = NULL;
     // Make sure we wait until the destructor has run.
-    scoped_refptr<base::ThreadTestHelper> helper(
-        new base::ThreadTestHelper(
-            BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB)));
-    ASSERT_TRUE(helper->Run());
+    base::RunLoop().RunUntilIdle();
 
     // Verify the database version is updated.
     {
       sql::Connection db;
       ASSERT_TRUE(db.Open(v3_db_path));
       sql::Statement smt(db.GetUniqueStatement(
           "SELECT value FROM meta WHERE key = \"version\""));
       ASSERT_TRUE(smt.Step());
       EXPECT_EQ(4, smt.ColumnInt(0));
       EXPECT_FALSE(smt.Step());
     }
   }
 }