diff options
| author | Iain Merrick <husky@google.com> | 2010-11-01 12:43:43 +0000 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-11-03 12:36:26 +0000 |
| commit | 2255f234e3edbf06b52de2ab4329d1564ef8efb0 (patch) | |
| tree | 1446ac1c01dc5d12e41c19af6b99b3a4702d8134 /net/socket | |
| parent | 731df977c0511bca2206b5f333555b1205ff1f43 (diff) | |
| download | external_chromium-2255f234e3edbf06b52de2ab4329d1564ef8efb0.zip external_chromium-2255f234e3edbf06b52de2ab4329d1564ef8efb0.tar.gz external_chromium-2255f234e3edbf06b52de2ab4329d1564ef8efb0.tar.bz2 | |
Merge Chromium at r63472 : Fix conflicts.
SharedMemory added to stats_table.cc, duplicating Android change.
http://src.chromium.org/viewvc/chrome?view=rev&revision=62510
chrome/browser/guid.h added to chrome/browser/autofill:
http://src.chromium.org/viewvc/chrome?view=rev&revision=63173
chrome_thread.h renamed to browser_thread.h:
http://src.chromium.org/viewvc/chrome?view=rev&revision=62286
DnsRRResolverWorker substantially overhauled:
http://src.chromium.org/viewvc/chrome?view=rev&revision=61071
X509 certificates added for OpenSSL (replacing old Android hacks):
http://src.chromium.org/viewvc/chrome?view=rev&revision=61955
OpenSSL now available in Chrome (previously enabled for Android only):
http://src.chromium.org/viewvc/chrome?view=rev&revision=60936
Change-Id: I42e4fefcdabd996cb3c173dc412318b8c5ee20e2
Diffstat (limited to 'net/socket')
| -rw-r--r-- | net/socket/client_socket_factory.cc | 6 | ||||
| -rw-r--r-- | net/socket/ssl_client_socket.h | 7 |
2 files changed, 0 insertions, 13 deletions
diff --git a/net/socket/client_socket_factory.cc b/net/socket/client_socket_factory.cc index eacac27..3ac5a00 100644 --- a/net/socket/client_socket_factory.cc +++ b/net/socket/client_socket_factory.cc @@ -37,14 +37,8 @@ SSLClientSocket* DefaultSSLClientSocketFactory( #elif defined(USE_OPENSSL) return new SSLClientSocketOpenSSL(transport_socket, hostname, ssl_config); #elif defined(USE_NSS) -<<<<<<< HEAD - return new SSLClientSocketNSS(transport_socket, hostname, ssl_config); -#elif defined(USE_OPENSSL) && defined(ANDROID) - return new SSLClientSocketOpenSSL(transport_socket, hostname, ssl_config); -======= return new SSLClientSocketNSS(transport_socket, hostname, ssl_config, shi.release()); ->>>>>>> chromium.org at r63472 #elif defined(OS_MACOSX) // TODO(wtc): SSLClientSocketNSS can't do SSL client authentication using // Mac OS X CDSA/CSSM yet (http://crbug.com/45369), so fall back on diff --git a/net/socket/ssl_client_socket.h b/net/socket/ssl_client_socket.h index 456d1ab..c3eb0da 100644 --- a/net/socket/ssl_client_socket.h +++ b/net/socket/ssl_client_socket.h @@ -32,15 +32,8 @@ class DNSSECProvider { virtual int GetDNSSECRecords(RRResponse** out, CompletionCallback* callback) = 0; -<<<<<<< HEAD -#ifdef ANDROID - protected: - virtual ~DNSSECProvider() {} -#endif -======= private: ~DNSSECProvider() {} ->>>>>>> chromium.org at r63472 }; // A client socket that uses SSL as the transport layer. |