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

Unified Diff: jingle/notifier/communicator/login_settings.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: jingle/notifier/communicator/login_settings.cc
===================================================================
--- jingle/notifier/communicator/login_settings.cc (revision 69414)
+++ jingle/notifier/communicator/login_settings.cc (working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -9,6 +9,7 @@
#include "base/logging.h"
#include "jingle/notifier/communicator/connection_options.h"
#include "jingle/notifier/communicator/xmpp_connection_generator.h"
+#include "net/base/cert_verifier.h"
#include "talk/base/common.h"
#include "talk/base/socketaddress.h"
#include "talk/xmpp/xmppclientsettings.h"
@@ -18,11 +19,13 @@
LoginSettings::LoginSettings(const buzz::XmppClientSettings& user_settings,
const ConnectionOptions& options,
net::HostResolver* host_resolver,
+ net::CertVerifier* cert_verifier,
ServerInformation* server_list,
int server_count,
bool try_ssltcp_first)
: try_ssltcp_first_(try_ssltcp_first),
host_resolver_(host_resolver),
+ cert_verifier_(cert_verifier),
server_list_(new ServerInformation[server_count]),
server_count_(server_count),
user_settings_(new buzz::XmppClientSettings(user_settings)),
@@ -30,6 +33,7 @@
// Note: firewall may be NULL.
DCHECK(server_list);
DCHECK(host_resolver);
+ DCHECK(cert_verifier);
DCHECK_GT(server_count, 0);
for (int i = 0; i < server_count_; ++i) {
server_list_[i] = server_list[i];

Powered by Google App Engine
This is Rietveld 408576698