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

Unified Diff: jingle/notifier/communicator/login_settings.h

Issue 6833031: Changed the jingle network code in ChromeAsyncSocket to use the client socket pool. This also all... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Review comments addressed Created 9 years, 8 months 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.h
===================================================================
--- jingle/notifier/communicator/login_settings.h (revision 81535)
+++ jingle/notifier/communicator/login_settings.h (working copy)
@@ -6,19 +6,15 @@
#define JINGLE_NOTIFIER_COMMUNICATOR_LOGIN_SETTINGS_H_
#include <string>
+#include "base/memory/ref_counted.h"
#include "jingle/notifier/base/server_information.h"
#include "jingle/notifier/communicator/xmpp_connection_generator.h"
+#include "net/url_request/url_request_context_getter.h"
namespace buzz {
class XmppClientSettings;
}
-namespace net {
-class CertVerifier;
-class HostPortPair;
-class HostResolver;
-}
-
namespace talk_base {
class SocketAddress;
}
@@ -30,8 +26,8 @@
public:
LoginSettings(const buzz::XmppClientSettings& user_settings,
const ConnectionOptions& options,
- net::HostResolver* host_resolver,
- net::CertVerifier* cert_verifier,
+ const scoped_refptr<net::URLRequestContextGetter>&
+ request_context_getter,
const ServerList& servers,
bool try_ssltcp_first,
const std::string& auth_mechanism);
@@ -42,14 +38,10 @@
return try_ssltcp_first_;
}
- net::HostResolver* host_resolver() {
- return host_resolver_;
+ scoped_refptr<net::URLRequestContextGetter> request_context_getter() {
+ return request_context_getter_;
}
- net::CertVerifier* cert_verifier() {
- return cert_verifier_;
- }
-
ServerList servers() const {
return
server_override_.get() ? ServerList(1, *server_override_) : servers_;
@@ -77,8 +69,7 @@
private:
bool try_ssltcp_first_;
- net::HostResolver* const host_resolver_;
- net::CertVerifier* const cert_verifier_;
+ scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
const ServerList servers_;
// Used to handle redirects
scoped_ptr<ServerInformation> server_override_;

Powered by Google App Engine
This is Rietveld 408576698