Relands "Removed InProcessBrowserTest::CleanUpOnMainThread()"

chrome/browser/ssl/ssl_client_certificate_selector_test.cc

Index: chrome/browser/ssl/ssl_client_certificate_selector_test.cc
diff --git a/chrome/browser/ssl/ssl_client_certificate_selector_test.cc b/chrome/browser/ssl/ssl_client_certificate_selector_test.cc
index d0318c6e7003e7d9dca7a8e3bf040af5616f4df1..d01f53818d06804735c284f1239d66a12cad2368 100644
--- a/chrome/browser/ssl/ssl_client_certificate_selector_test.cc
+++ b/chrome/browser/ssl/ssl_client_certificate_selector_test.cc
@@ -66,11 +66,11 @@ void SSLClientCertificateSelectorTestBase::SetUpOnMainThread() {
 
 // Have to release our reference to the auth handler during the test to allow
 // it to be destroyed while the Browser and its IO thread still exist.
-void SSLClientCertificateSelectorTestBase::CleanUpOnMainThread() {
+void SSLClientCertificateSelectorTestBase::TearDownOnMainThread() {
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
-      base::Bind(&SSLClientCertificateSelectorTestBase::CleanUpOnIOThread,
+      base::Bind(&SSLClientCertificateSelectorTestBase::TearDownOnIOThread,
                  this));
 
   io_loop_finished_event_.Wait();
@@ -87,7 +87,7 @@ void SSLClientCertificateSelectorTestBase::SetUpOnIOThread() {
   io_loop_finished_event_.Signal();
 }
 
-void SSLClientCertificateSelectorTestBase::CleanUpOnIOThread() {
+void SSLClientCertificateSelectorTestBase::TearDownOnIOThread() {
   delete url_request_;
 
   io_loop_finished_event_.Signal();