Relands "Removed InProcessBrowserTest::CleanUpOnMainThread()"

chrome/browser/ssl/ssl_client_certificate_selector_test.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 "chrome/browser/ssl/ssl_client_certificate_selector_test.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 48 matching lines @@
                  this));
 
   io_loop_finished_event_.Wait();
 
   content::WaitForLoadStop(
       browser()->tab_strip_model()->GetActiveWebContents());
 }
 
 // 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();
 
   auth_requestor_ = NULL;
 }
 
 void SSLClientCertificateSelectorTestBase::SetUpOnIOThread() {
   url_request_ = MakeURLRequest(url_request_context_getter_.get()).release();
 
   auth_requestor_ = new StrictMock<SSLClientAuthRequestorMock>(
       url_request_, cert_request_info_.get());
 
   io_loop_finished_event_.Signal();
 }
 
-void SSLClientCertificateSelectorTestBase::CleanUpOnIOThread() {
+void SSLClientCertificateSelectorTestBase::TearDownOnIOThread() {
   delete url_request_;
 
   io_loop_finished_event_.Signal();
 }
 
 scoped_ptr<net::URLRequest>
 SSLClientCertificateSelectorTestBase::MakeURLRequest(
     net::URLRequestContextGetter* context_getter) {
   scoped_ptr<net::URLRequest> request =
       context_getter->GetURLRequestContext()->CreateRequest(
           GURL("https://example"), net::DEFAULT_PRIORITY, NULL, NULL);
   return request.Pass();
 }