Use new callbacks for SSL UI.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/8080010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103555 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 32 insertions, 26 deletions

diff --git a/content/browser/content_browser_client.h b/content/browser/content_browser_client.h
index 0f755ef..0597954 100644
--- a/content/browser/content_browser_client.h
+++ b/content/browser/content_browser_client.h
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include "base/callback_old.h"
+#include "base/callback.h"
 #include "content/common/content_client.h"
 #include "content/common/window_container_type.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPresenter.h"
@@ -201,7 +201,7 @@ class ContentBrowserClient {
   virtual void AllowCertificateError(
       SSLCertErrorHandler* handler,
       bool overridable,
-      Callback2<SSLCertErrorHandler*, bool>::Type* callback) = 0;
+      const base::Callback<void(SSLCertErrorHandler*, bool)>& callback) = 0;
 
   // Selects a SSL client certificate and returns it to the |handler|. If no
   // certificate was selected NULL is returned to the |handler|.
diff --git a/content/browser/mock_content_browser_client.cc b/content/browser/mock_content_browser_client.cc
index 8d6af00..0f802ff 100644
--- a/content/browser/mock_content_browser_client.cc
+++ b/content/browser/mock_content_browser_client.cc
@@ -147,7 +147,7 @@ void MockContentBrowserClient::ShowItemInFolder(const FilePath& path) {
 void MockContentBrowserClient::AllowCertificateError(
     SSLCertErrorHandler* handler,
     bool overridable,
-    Callback2<SSLCertErrorHandler*, bool>::Type* callback) {
+    const base::Callback<void(SSLCertErrorHandler*, bool)>& callback) {
 }
 
 void MockContentBrowserClient::SelectClientCertificate(
diff --git a/content/browser/mock_content_browser_client.h b/content/browser/mock_content_browser_client.h
index d7384a6..6d9a217 100644
--- a/content/browser/mock_content_browser_client.h
+++ b/content/browser/mock_content_browser_client.h
@@ -72,7 +72,8 @@ class MockContentBrowserClient : public ContentBrowserClient {
   virtual void AllowCertificateError(
       SSLCertErrorHandler* handler,
       bool overridable,
-      Callback2<SSLCertErrorHandler*, bool>::Type* callback) OVERRIDE;
+      const base::Callback<void(SSLCertErrorHandler*, bool)>& callback)
+      OVERRIDE;
   virtual void SelectClientCertificate(
       int render_process_id,
       int render_view_id,
diff --git a/content/browser/ssl/ssl_client_auth_handler.cc b/content/browser/ssl/ssl_client_auth_handler.cc
index be78e77..d7699b3 100644
--- a/content/browser/ssl/ssl_client_auth_handler.cc
+++ b/content/browser/ssl/ssl_client_auth_handler.cc
@@ -4,6 +4,7 @@
 
 #include "content/browser/ssl/ssl_client_auth_handler.h"
 
+#include "base/bind.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/content_browser_client.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
@@ -45,8 +46,8 @@ void SSLClientAuthHandler::SelectCertificate() {
   // the net::URLRequest always gets a response.
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
-      NewRunnableMethod(
-          this, &SSLClientAuthHandler::DoSelectCertificate,
+      base::Bind(
+          &SSLClientAuthHandler::DoSelectCertificate, this,
           render_process_host_id, render_view_host_id));
 }
 
@@ -71,8 +72,8 @@ void SSLClientAuthHandler::CertificateSelectedNoNotify(
   VLOG(1) << this << " CertificateSelectedNoNotify " << cert;
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
-      NewRunnableMethod(
-          this, &SSLClientAuthHandler::DoCertificateSelected,
+      base::Bind(
+          &SSLClientAuthHandler::DoCertificateSelected, this,
           make_scoped_refptr(cert)));
 }
 
diff --git a/content/browser/ssl/ssl_error_handler.cc b/content/browser/ssl/ssl_error_handler.cc
index 8fc86bd..8771996 100644
--- a/content/browser/ssl/ssl_error_handler.cc
+++ b/content/browser/ssl/ssl_error_handler.cc
@@ -1,9 +1,10 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "content/browser/ssl/ssl_error_handler.h"
 
+#include "base/bind.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
@@ -84,8 +85,8 @@ void SSLErrorHandler::CancelRequest() {
   // We need to complete this task on the IO thread.
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
-      NewRunnableMethod(
-          this, &SSLErrorHandler::CompleteCancelRequest, net::ERR_ABORTED));
+      base::Bind(
+          &SSLErrorHandler::CompleteCancelRequest, this, net::ERR_ABORTED));
 }
 
 void SSLErrorHandler::DenyRequest() {
@@ -94,8 +95,8 @@ void SSLErrorHandler::DenyRequest() {
   // We need to complete this task on the IO thread.
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
-      NewRunnableMethod(
-          this, &SSLErrorHandler::CompleteCancelRequest,
+      base::Bind(
+          &SSLErrorHandler::CompleteCancelRequest, this,
           net::ERR_INSECURE_RESPONSE));
 }
 
@@ -105,7 +106,7 @@ void SSLErrorHandler::ContinueRequest() {
   // We need to complete this task on the IO thread.
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
-      NewRunnableMethod(this, &SSLErrorHandler::CompleteContinueRequest));
+      base::Bind(&SSLErrorHandler::CompleteContinueRequest, this));
 }
 
 void SSLErrorHandler::TakeNoAction() {
@@ -114,7 +115,7 @@ void SSLErrorHandler::TakeNoAction() {
   // We need to complete this task on the IO thread.
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
-      NewRunnableMethod(this, &SSLErrorHandler::CompleteTakeNoAction));
+      base::Bind(&SSLErrorHandler::CompleteTakeNoAction, this));
 }
 
 void SSLErrorHandler::CompleteCancelRequest(int error) {
diff --git a/content/browser/ssl/ssl_manager.cc b/content/browser/ssl/ssl_manager.cc
index 83b4d66..247c611 100644
--- a/content/browser/ssl/ssl_manager.cc
+++ b/content/browser/ssl/ssl_manager.cc
@@ -4,6 +4,7 @@
 
 #include "content/browser/ssl/ssl_manager.h"
 
+#include "base/bind.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/load_from_memory_cache_details.h"
@@ -38,12 +39,12 @@ void SSLManager::OnSSLCertificateError(ResourceDispatcherHost* rdh,
   // hand it over to the UI thread for processing.
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
-      NewRunnableMethod(new SSLCertErrorHandler(rdh,
-                                                request,
-                                                info->resource_type(),
-                                                ssl_info,
-                                                is_hsts_host),
-                        &SSLCertErrorHandler::Dispatch));
+      base::Bind(&SSLCertErrorHandler::Dispatch,
+                 new SSLCertErrorHandler(rdh,
+                                         request,
+                                         info->resource_type(),
+                                         ssl_info,
+                                         is_hsts_host)));
 }
 
 // static
diff --git a/content/browser/ssl/ssl_policy.cc b/content/browser/ssl/ssl_policy.cc
index 256c27f..8aad0bc 100644
--- a/content/browser/ssl/ssl_policy.cc
+++ b/content/browser/ssl/ssl_policy.cc
@@ -4,6 +4,7 @@
 
 #include "content/browser/ssl/ssl_policy.h"
 
+#include "base/bind.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
@@ -196,10 +197,10 @@ void SSLPolicy::OnCertErrorInternal(SSLCertErrorHandler* handler,
     return;
   }
 
-  Callback2<SSLCertErrorHandler*, bool>::Type* callback =
-      NewCallback(this, &SSLPolicy::OnAllowCertificate);
   content::GetContentClient()->browser()->AllowCertificateError(
-      handler, overridable, callback);
+      handler,
+      overridable,
+      base::Bind(&SSLPolicy::OnAllowCertificate, base::Unretained(this)));
 }
 
 void SSLPolicy::InitializeEntryIfNeeded(NavigationEntry* entry) {
diff --git a/content/shell/shell_content_browser_client.cc b/content/shell/shell_content_browser_client.cc
index d98d292..3028b48 100644
--- a/content/shell/shell_content_browser_client.cc
+++ b/content/shell/shell_content_browser_client.cc
@@ -156,7 +156,7 @@ void ShellContentBrowserClient::ShowItemInFolder(const FilePath& path) {
 void ShellContentBrowserClient::AllowCertificateError(
     SSLCertErrorHandler* handler,
     bool overridable,
-    Callback2<SSLCertErrorHandler*, bool>::Type* callback) {
+    const base::Callback<void(SSLCertErrorHandler*, bool)>& callback) {
 }
 
 void ShellContentBrowserClient::SelectClientCertificate(
diff --git a/content/shell/shell_content_browser_client.h b/content/shell/shell_content_browser_client.h
index 38c63f9..8128137 100644
--- a/content/shell/shell_content_browser_client.h
+++ b/content/shell/shell_content_browser_client.h
@@ -84,7 +84,8 @@ class ShellContentBrowserClient : public ContentBrowserClient
   virtual void AllowCertificateError(
       SSLCertErrorHandler* handler,
       bool overridable,
-      Callback2<SSLCertErrorHandler*, bool>::Type* callback) OVERRIDE;
+      const base::Callback<void(SSLCertErrorHandler*, bool)>& callback)
+      OVERRIDE;
   virtual void SelectClientCertificate(
       int render_process_id,
       int render_view_id,