| Index: extensions/browser/api/socket/tls_socket.h
|
| diff --git a/extensions/browser/api/socket/tls_socket.h b/extensions/browser/api/socket/tls_socket.h
|
| index 0c4d87ea86edfb3a7c91d8a453eafd53596338e4..39e357ce527a0830b9c24804a919a0c1f6ee1376 100644
|
| --- a/extensions/browser/api/socket/tls_socket.h
|
| +++ b/extensions/browser/api/socket/tls_socket.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_EXTENSIONS_API_SOCKET_TLS_SOCKET_H_
|
| -#define CHROME_BROWSER_EXTENSIONS_API_SOCKET_TLS_SOCKET_H_
|
| +#ifndef EXTENSIONS_BROWSER_API_SOCKET_TLS_SOCKET_H_
|
| +#define EXTENSIONS_BROWSER_API_SOCKET_TLS_SOCKET_H_
|
|
|
| #include <string>
|
|
|
| @@ -20,8 +20,6 @@ class TransportSecurityState;
|
|
|
| namespace extensions {
|
|
|
| -class TLSSocket;
|
| -
|
| // TLS Sockets from the chrome.socket and chrome.sockets.tcp APIs. A regular
|
| // TCPSocket is converted to a TLSSocket via chrome.socket.secure() or
|
| // chrome.sockets.tcp.secure(). The inheritance here is for interface API
|
| @@ -36,7 +34,7 @@ class TLSSocket : public ResumableTCPSocket {
|
| public:
|
| typedef base::Callback<void(scoped_ptr<TLSSocket>, int)> SecureCallback;
|
|
|
| - TLSSocket(scoped_ptr<net::StreamSocket> tls_socket,
|
| + TLSSocket(scoped_ptr<BufferingStreamSocket> tls_socket,
|
| const std::string& owner_extension_id);
|
|
|
| ~TLSSocket() override;
|
| @@ -108,11 +106,10 @@ class TLSSocket : public ResumableTCPSocket {
|
| void OnReadComplete(const scoped_refptr<net::IOBuffer>& io_buffer,
|
| int result);
|
|
|
| - scoped_ptr<net::StreamSocket> tls_socket_;
|
| + scoped_ptr<BufferingStreamSocket> tls_socket_;
|
| ReadCompletionCallback read_callback_;
|
| };
|
|
|
| } // namespace extensions
|
|
|
| -#endif // CHROME_BROWSER_EXTENSIONS_API_SOCKET_TLS_SOCKET_H_
|
| -
|
| +#endif // EXTENSIONS_BROWSER_API_SOCKET_TLS_SOCKET_H_
|
|
|