Index: chrome/browser/certificate_manager_model.h |
diff --git a/chrome/browser/certificate_manager_model.h b/chrome/browser/certificate_manager_model.h |
index 7364b32714bbf2727e32319515812af7c7d89866..c745963ec0de988c93c6ba13c73d853a76a41803 100644 |
--- a/chrome/browser/certificate_manager_model.h |
+++ b/chrome/browser/certificate_manager_model.h |
@@ -11,9 +11,12 @@ |
#include "base/callback.h" |
#include "base/memory/ref_counted.h" |
#include "base/memory/scoped_ptr.h" |
+#include "base/memory/weak_ptr.h" |
#include "base/strings/string16.h" |
#include "net/cert/nss_cert_database.h" |
+class CertDatabaseServiceIOPart; |
+ |
namespace content { |
class BrowserContext; |
class ResourceContext; |
@@ -50,7 +53,7 @@ class CertificateManagerModel { |
// Creates a CertificateManagerModel. The model will be passed to the callback |
// when it is ready. The caller must ensure the model does not outlive the |
// |browser_context|. |
- static void Create(content::BrowserContext* browser_context, |
+ static void Create(content::BrowserContext* context, |
Observer* observer, |
const CreationCallback& callback); |
@@ -138,9 +141,10 @@ class CertificateManagerModel { |
CertificateManagerModel::Observer* observer, |
const CreationCallback& callback, |
net::NSSCertDatabase* cert_db); |
- static void GetCertDBOnIOThread(content::ResourceContext* context, |
- CertificateManagerModel::Observer* observer, |
- const CreationCallback& callback); |
+ static void GetCertDBOnIOThread( |
+ base::WeakPtr<CertDatabaseServiceIOPart> cert_db_service_io, |
+ CertificateManagerModel::Observer* observer, |
+ const CreationCallback& callback); |
// Callback used by Refresh() for when the cert slots have been unlocked. |
// This method does the actual refreshing. |