Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / cocoa / ssl_client_certificate_selector_cocoa.mm

diff --git a/src/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm b/src/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm
index 3b2fef9..9d471b9 100644 (file)
--- a/src/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm
+++ b/src/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm
@@ -40,22 +40,21 @@ class SSLClientAuthObserverCocoaBridge : public SSLClientAuthObserver,
                                          public ConstrainedWindowMacDelegate {
  public:
   SSLClientAuthObserverCocoaBridge(
-      const net::HttpNetworkSession* network_session,
+      const content::BrowserContext* browser_context,
       net::SSLCertRequestInfo* cert_request_info,
       const chrome::SelectCertificateCallback& callback,
       SSLClientCertificateSelectorCocoa* controller)
-      : SSLClientAuthObserver(network_session, cert_request_info, callback),
+      : SSLClientAuthObserver(browser_context, cert_request_info, callback),
         controller_(controller) {
   }
 
   // SSLClientAuthObserver implementation:
-  virtual void OnCertSelectedByNotification() OVERRIDE {
+  void OnCertSelectedByNotification() override {
     [controller_ closeWebContentsModalDialog];
   }
 
   // ConstrainedWindowMacDelegate implementation:
-  virtual void OnConstrainedWindowClosed(
-      ConstrainedWindowMac* window) OVERRIDE {
+  void OnConstrainedWindowClosed(ConstrainedWindowMac* window) override {
     // |onConstrainedWindowClosed| will delete the sheet which might be still
     // in use higher up the call stack. Wait for the next cycle of the event
     // loop to call this function.
@@ -72,14 +71,13 @@ namespace chrome {
 
 void ShowSSLClientCertificateSelector(
     content::WebContents* contents,
-    const net::HttpNetworkSession* network_session,
     net::SSLCertRequestInfo* cert_request_info,
     const SelectCertificateCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   // The dialog manages its own lifetime.
   SSLClientCertificateSelectorCocoa* selector =
       [[SSLClientCertificateSelectorCocoa alloc]
-          initWithNetworkSession:network_session
+          initWithBrowserContext:contents->GetBrowserContext()
                  certRequestInfo:cert_request_info
                         callback:callback];
   [selector displayForWebContents:contents];
@@ -89,14 +87,14 @@ void ShowSSLClientCertificateSelector(
 
 @implementation SSLClientCertificateSelectorCocoa
 
-- (id)initWithNetworkSession:(const net::HttpNetworkSession*)networkSession
+- (id)initWithBrowserContext:(const content::BrowserContext*)browserContext
     certRequestInfo:(net::SSLCertRequestInfo*)certRequestInfo
            callback:(const chrome::SelectCertificateCallback&)callback {
-  DCHECK(networkSession);
+  DCHECK(browserContext);
   DCHECK(certRequestInfo);
   if ((self = [super init])) {
     observer_.reset(new SSLClientAuthObserverCocoaBridge(
-        networkSession, certRequestInfo, callback, self));
+        browserContext, certRequestInfo, callback, self));
   }
   return self;
 }