Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / ssl_client_certificate_selector_browsertest.cc

diff --git a/src/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc b/src/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc
index c677b8b..518126d 100644 (file)
--- a/src/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc
+++ b/src/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc
@@ -93,7 +93,7 @@ class SSLClientCertificateSelectorTest : public InProcessBrowserTest {
 
   // 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));
@@ -192,10 +192,10 @@ class SSLClientCertificateSelectorMultiTabTest
     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 {
@@ -255,9 +255,9 @@ class SSLClientCertificateSelectorMultiProfileTest
     SSLClientCertificateSelectorTest::SetUpOnIOThread();
   }
 
-  virtual void CleanUpOnMainThread() OVERRIDE {
+  virtual void TearDownOnMainThread() OVERRIDE {
     auth_requestor_1_ = NULL;
-    SSLClientCertificateSelectorTest::CleanUpOnMainThread();
+    SSLClientCertificateSelectorTest::TearDownOnMainThread();
   }
 
   virtual void CleanUpOnIOThread() OVERRIDE {