Relands "Removed InProcessBrowserTest::CleanUpOnMainThread()"

chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.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/files/file_path.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ssl/ssl_client_auth_requestor_mock.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 75 matching lines @@
 
     auth_requestor_ = new StrictMock<SSLClientAuthRequestorMock>(
         url_request_,
         cert_request_info_);
 
     io_loop_finished_event_.Signal();
   }
 
   // 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.
-  virtual void CleanUpOnMainThread() OVERRIDE {
+  virtual void TearDownOnMainThread() OVERRIDE {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&SSLClientCertificateSelectorTest::CleanUpOnIOThread, this));
 
     io_loop_finished_event_.Wait();
 
     auth_requestor_ = NULL;
   }
 
   virtual void CleanUpOnIOThread() {
@@ skipping 78 matching lines @@
     auth_requestor_1_ = new StrictMock<SSLClientAuthRequestorMock>(
         url_request_1_,
         cert_request_info_1_);
     auth_requestor_2_ = new StrictMock<SSLClientAuthRequestorMock>(
         url_request_2_,
         cert_request_info_2_);
 
     SSLClientCertificateSelectorTest::SetUpOnIOThread();
   }
 
-  virtual void CleanUpOnMainThread() OVERRIDE {
+  virtual void TearDownOnMainThread() OVERRIDE {
     auth_requestor_2_ = NULL;
     auth_requestor_1_ = NULL;
-    SSLClientCertificateSelectorTest::CleanUpOnMainThread();
+    SSLClientCertificateSelectorTest::TearDownOnMainThread();
   }
 
   virtual void CleanUpOnIOThread() OVERRIDE {
     delete url_request_1_;
     delete url_request_2_;
     SSLClientCertificateSelectorTest::CleanUpOnIOThread();
   }
 
  protected:
   net::URLRequest* url_request_1_;
@@ skipping 39 matching lines @@
   virtual void SetUpOnIOThread() OVERRIDE {
     url_request_1_ = MakeURLRequest(url_request_context_getter_1_).release();
 
     auth_requestor_1_ = new StrictMock<SSLClientAuthRequestorMock>(
         url_request_1_,
         cert_request_info_1_);
 
     SSLClientCertificateSelectorTest::SetUpOnIOThread();
   }
 
-  virtual void CleanUpOnMainThread() OVERRIDE {
+  virtual void TearDownOnMainThread() OVERRIDE {
     auth_requestor_1_ = NULL;
-    SSLClientCertificateSelectorTest::CleanUpOnMainThread();
+    SSLClientCertificateSelectorTest::TearDownOnMainThread();
   }
 
   virtual void CleanUpOnIOThread() OVERRIDE {
     delete url_request_1_;
     SSLClientCertificateSelectorTest::CleanUpOnIOThread();
   }
 
  protected:
   Browser* browser_1_;
   scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_1_;
@@ skipping 114 matching lines @@
   EXPECT_TRUE(ui_test_utils::SendKeyPressSync(
       browser_1_, ui::VKEY_RETURN, false, false, false, false));
 
   Mock::VerifyAndClear(auth_requestor_.get());
   Mock::VerifyAndClear(auth_requestor_1_.get());
 
   // Now let the default selection for auth_requestor_ mock get checked on
   // destruction.
   EXPECT_CALL(*auth_requestor_, CertificateSelected(NULL));
 }