diff options
| author | Iain Merrick <husky@google.com> | 2010-10-13 15:07:26 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-10-19 14:37:57 +0100 |
| commit | dd0e069b1c2e5079f99024c4d54c7d06ef81d11b (patch) | |
| tree | 9246dc13dc5df6a7926fabacc06496e5c2c1ade7 /net/socket | |
| parent | 90d7822561da7131cc2f3ba0415750e659b7b8e4 (diff) | |
| download | external_chromium-dd0e069b1c2e5079f99024c4d54c7d06ef81d11b.zip external_chromium-dd0e069b1c2e5079f99024c4d54c7d06ef81d11b.tar.gz external_chromium-dd0e069b1c2e5079f99024c4d54c7d06ef81d11b.tar.bz2 | |
Merge Chromium at 7.0.540.0 : Fix networking code.
Linux-specific code in dnsrr_resolver.cc doesn't compile on Android.
http://src.chromium.org/viewvc/chrome?view=rev&revision=54907
NetLog added to HostResolver, fixing Android-specific code.
http://src.chromium.org/viewvc/chrome?view=rev&revision=57189
Linux-specific IPv6 code in net_util.cc doesn't compile on Android.
http://src.chromium.org/viewvc/chrome?view=rev&revision=41743
Not including SSL false start blacklist on Android to reduce bloat.
http://src.chromium.org/viewvc/chrome?view=rev&revision=58824
ProxyConfigServiceNull is still used on unsupported platforms.
This is a bug in Chromium. Reverting its deletion.
http://src.chromium.org/viewvc/chrome?view=rev&revision=59362
Added virtual destructor to DNSSECPRovider in ssl_client_socket.h
This has already been done for other Chrome classes, should be easy
to upstream.
Change-Id: I158fc709c295712dc35c4172708a294f65a381a4
Diffstat (limited to 'net/socket')
| -rw-r--r-- | net/socket/ssl_client_socket.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/socket/ssl_client_socket.h b/net/socket/ssl_client_socket.h index 064dd26..de521db 100644 --- a/net/socket/ssl_client_socket.h +++ b/net/socket/ssl_client_socket.h @@ -30,6 +30,11 @@ class DNSSECProvider { // function will return OK if called again. virtual int GetDNSSECRecords(RRResponse** out, CompletionCallback* callback) = 0; + +#ifdef ANDROID + protected: + virtual ~DNSSECProvider() {} +#endif }; // A client socket that uses SSL as the transport layer. |