Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(23)

Unified Diff: chrome/browser/sync/tools/sync_listen_notifications.cc

Issue 5958001: The MediatorThread worker thread needs to have a CertVerifier... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fix typos in xmpp_connection_unittest.cc Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/tools/sync_listen_notifications.cc
===================================================================
--- chrome/browser/sync/tools/sync_listen_notifications.cc (revision 69414)
+++ chrome/browser/sync/tools/sync_listen_notifications.cc (working copy)
@@ -25,6 +25,7 @@
#include "jingle/notifier/listener/send_update_task.h"
#include "jingle/notifier/listener/subscribe_task.h"
#include "jingle/notifier/listener/xml_element_util.h"
+#include "net/base/cert_verifier.h"
#include "net/base/ssl_config_service.h"
#include "net/socket/client_socket_factory.h"
#include "talk/base/cryptstring.h"
@@ -66,10 +67,12 @@
virtual ~XmppNotificationClient() {}
// Connect with the given XMPP settings and run until disconnected.
- void Run(const buzz::XmppClientSettings& xmpp_client_settings) {
+ void Run(const buzz::XmppClientSettings& xmpp_client_settings,
+ net::CertVerifier* cert_verifier) {
DCHECK(!xmpp_connection_.get());
xmpp_connection_.reset(
- new notifier::XmppConnection(xmpp_client_settings, this, NULL));
+ new notifier::XmppConnection(xmpp_client_settings, cert_verifier,
+ this, NULL));
MessageLoop::current()->Run();
DCHECK(!xmpp_connection_.get());
}
@@ -295,6 +298,8 @@
}
xmpp_client_settings.set_server(addr);
+ net::CertVerifier cert_verifier;
+
agl 2010/12/17 16:22:01 (very minor): I would remove this blank line.
MessageLoopForIO message_loop;
// Connect and listen.
@@ -310,7 +315,7 @@
}
XmppNotificationClient xmpp_notification_client(
observers.begin(), observers.end());
- xmpp_notification_client.Run(xmpp_client_settings);
+ xmpp_notification_client.Run(xmpp_client_settings, &cert_verifier);
return 0;
}
« no previous file with comments | « no previous file | jingle/notifier/base/chrome_async_socket.h » ('j') | jingle/notifier/base/chrome_async_socket.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698