diff options
Diffstat (limited to 'net/http')
37 files changed, 111 insertions, 107 deletions
diff --git a/net/http/des.h b/net/http/des.h index 5ae4916..5f0fb34 100644 --- a/net/http/des.h +++ b/net/http/des.h @@ -7,7 +7,7 @@ #pragma once #include "base/basictypes.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" namespace net { @@ -17,12 +17,13 @@ namespace net { // TODO(wtc): Turn this into a C++ API and move it to the base module. // Build a 64-bit DES key from a 56-bit raw key. -NET_TEST void DESMakeKey(const uint8* raw, uint8* key); +NET_EXPORT_PRIVATE void DESMakeKey(const uint8* raw, uint8* key); // Run the DES encryption algorithm in ECB mode on one block (8 bytes) of // data. |key| is a DES key (8 bytes), |src| is the input plaintext (8 // bytes), and |hash| is an 8-byte buffer receiving the output ciphertext. -NET_TEST void DESEncrypt(const uint8* key, const uint8* src, uint8* hash); +NET_EXPORT_PRIVATE void DESEncrypt(const uint8* key, const uint8* src, + uint8* hash); } // namespace net diff --git a/net/http/http_alternate_protocols.h b/net/http/http_alternate_protocols.h index 5452d06..3e10e08 100644 --- a/net/http/http_alternate_protocols.h +++ b/net/http/http_alternate_protocols.h @@ -16,11 +16,11 @@ #include "base/basictypes.h" #include "net/base/host_port_pair.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" namespace net { -class NET_API HttpAlternateProtocols { +class NET_EXPORT HttpAlternateProtocols { public: enum Protocol { NPN_SPDY_1, @@ -30,7 +30,7 @@ class NET_API HttpAlternateProtocols { UNINITIALIZED, }; - struct NET_API PortProtocolPair { + struct NET_EXPORT PortProtocolPair { bool Equals(const PortProtocolPair& other) const { return port == other.port && protocol == other.protocol; } diff --git a/net/http/http_auth.h b/net/http/http_auth.h index 4a89a60..5140596c 100644 --- a/net/http/http_auth.h +++ b/net/http/http_auth.h @@ -11,7 +11,7 @@ #include "base/memory/scoped_ptr.h" #include "base/string16.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" #include "net/http/http_util.h" template <class T> class scoped_refptr; @@ -24,7 +24,7 @@ class HttpAuthHandlerFactory; class HttpResponseHeaders; // Utility class for http authentication. -class NET_TEST HttpAuth { +class NET_EXPORT_PRIVATE HttpAuth { public: // Http authentication can be done the the proxy server, origin server, // or both. This enum tracks who the target is. @@ -177,7 +177,7 @@ class NET_TEST HttpAuth { // parameters as either a base-64 encoded string or a comma-delimited list // of name-value pairs. param_pairs() and base64_param() methods are provided // to support either usage. - class NET_TEST ChallengeTokenizer { + class NET_EXPORT_PRIVATE ChallengeTokenizer { public: ChallengeTokenizer(std::string::const_iterator begin, std::string::const_iterator end) diff --git a/net/http/http_auth_cache.h b/net/http/http_auth_cache.h index e7eb305..33ce2a5 100644 --- a/net/http/http_auth_cache.h +++ b/net/http/http_auth_cache.h @@ -13,7 +13,7 @@ #include "base/memory/ref_counted.h" #include "base/string16.h" #include "googleurl/src/gurl.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" #include "net/http/http_auth.h" namespace net { @@ -26,7 +26,7 @@ namespace net { // - the last auth handler used (contains realm and authentication scheme) // - the list of paths which used this realm // Entries can be looked up by either (origin, realm, scheme) or (origin, path). -class NET_TEST HttpAuthCache { +class NET_EXPORT_PRIVATE HttpAuthCache { public: class Entry; @@ -109,7 +109,7 @@ class NET_TEST HttpAuthCache { }; // An authentication realm entry. -class NET_TEST HttpAuthCache::Entry { +class NET_EXPORT_PRIVATE HttpAuthCache::Entry { public: ~Entry(); diff --git a/net/http/http_auth_controller.h b/net/http/http_auth_controller.h index cd3de04..4b1e828 100644 --- a/net/http/http_auth_controller.h +++ b/net/http/http_auth_controller.h @@ -16,7 +16,7 @@ #include "base/threading/non_thread_safe.h" #include "googleurl/src/gurl.h" #include "net/base/completion_callback.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" #include "net/base/net_log.h" #include "net/http/http_auth.h" @@ -29,7 +29,7 @@ class HttpAuthCache; class HttpRequestHeaders; struct HttpRequestInfo; -class NET_TEST HttpAuthController +class NET_EXPORT_PRIVATE HttpAuthController : public base::RefCounted<HttpAuthController>, NON_EXPORTED_BASE(public base::NonThreadSafe) { public: diff --git a/net/http/http_auth_filter.h b/net/http/http_auth_filter.h index 108a72c..bf137c9 100644 --- a/net/http/http_auth_filter.h +++ b/net/http/http_auth_filter.h @@ -9,7 +9,7 @@ #include <list> #include <string> -#include "net/base/net_api.h" +#include "net/base/net_export.h" #include "net/http/http_auth.h" #include "net/proxy/proxy_bypass_rules.h" @@ -19,7 +19,7 @@ namespace net { // |HttpAuthFilter|s determine whether an authentication scheme should be // allowed for a particular peer. -class NET_TEST HttpAuthFilter { +class NET_EXPORT_PRIVATE HttpAuthFilter { public: virtual ~HttpAuthFilter() {} @@ -33,7 +33,7 @@ class NET_TEST HttpAuthFilter { // // Uses the ProxyBypassRules class to do whitelisting for servers. // All proxies are allowed. -class NET_API HttpAuthFilterWhitelist : public HttpAuthFilter { +class NET_EXPORT HttpAuthFilterWhitelist : public HttpAuthFilter { public: explicit HttpAuthFilterWhitelist(const std::string& server_whitelist); virtual ~HttpAuthFilterWhitelist(); diff --git a/net/http/http_auth_gssapi_posix.h b/net/http/http_auth_gssapi_posix.h index e25bf39..b1b1227 100644 --- a/net/http/http_auth_gssapi_posix.h +++ b/net/http/http_auth_gssapi_posix.h @@ -11,7 +11,7 @@ #include "base/gtest_prod_util.h" #include "base/native_library.h" #include "base/string16.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" #include "net/http/http_auth.h" #define GSS_USE_FUNCTION_POINTERS @@ -19,15 +19,15 @@ namespace net { -NET_TEST extern gss_OID CHROME_GSS_C_NT_HOSTBASED_SERVICE_X; -NET_TEST extern gss_OID CHROME_GSS_C_NT_HOSTBASED_SERVICE; -NET_TEST extern gss_OID CHROME_GSS_KRB5_MECH_OID_DESC; +NET_EXPORT_PRIVATE extern gss_OID CHROME_GSS_C_NT_HOSTBASED_SERVICE_X; +NET_EXPORT_PRIVATE extern gss_OID CHROME_GSS_C_NT_HOSTBASED_SERVICE; +NET_EXPORT_PRIVATE extern gss_OID CHROME_GSS_KRB5_MECH_OID_DESC; // GSSAPILibrary is introduced so unit tests can mock the calls to the GSSAPI // library. The default implementation attempts to load one of the standard // GSSAPI library implementations, then simply passes the arguments on to // that implementation. -class NET_TEST GSSAPILibrary { +class NET_EXPORT_PRIVATE GSSAPILibrary { public: virtual ~GSSAPILibrary() {} @@ -99,7 +99,7 @@ class NET_TEST GSSAPILibrary { }; // GSSAPISharedLibrary class is defined here so that unit tests can access it. -class NET_TEST GSSAPISharedLibrary : public GSSAPILibrary { +class NET_EXPORT_PRIVATE GSSAPISharedLibrary : public GSSAPILibrary { public: // If |gssapi_library_name| is empty, hard-coded default library names are // used. @@ -214,7 +214,7 @@ class ScopedSecurityContext { // TODO(ahendrickson): Share code with HttpAuthSSPI. -class NET_TEST HttpAuthGSSAPI { +class NET_EXPORT_PRIVATE HttpAuthGSSAPI { public: HttpAuthGSSAPI(GSSAPILibrary* library, const std::string& scheme, diff --git a/net/http/http_auth_handler.h b/net/http/http_auth_handler.h index 4065de5..f4e35a4 100644 --- a/net/http/http_auth_handler.h +++ b/net/http/http_auth_handler.h @@ -10,7 +10,7 @@ #include "base/string16.h" #include "net/base/completion_callback.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" #include "net/base/net_log.h" #include "net/http/http_auth.h" @@ -21,7 +21,7 @@ struct HttpRequestInfo; // HttpAuthHandler is the interface for the authentication schemes // (basic, digest, NTLM, Negotiate). // HttpAuthHandler objects are typically created by an HttpAuthHandlerFactory. -class NET_TEST HttpAuthHandler { +class NET_EXPORT_PRIVATE HttpAuthHandler { public: HttpAuthHandler(); virtual ~HttpAuthHandler(); diff --git a/net/http/http_auth_handler_basic.h b/net/http/http_auth_handler_basic.h index 5c747c9..1df5367 100644 --- a/net/http/http_auth_handler_basic.h +++ b/net/http/http_auth_handler_basic.h @@ -9,16 +9,16 @@ #include <string> #include "base/string16.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" #include "net/http/http_auth_handler.h" #include "net/http/http_auth_handler_factory.h" namespace net { // Code for handling http basic authentication. -class NET_TEST HttpAuthHandlerBasic : public HttpAuthHandler { +class NET_EXPORT_PRIVATE HttpAuthHandlerBasic : public HttpAuthHandler { public: - class NET_TEST Factory : public HttpAuthHandlerFactory { + class NET_EXPORT_PRIVATE Factory : public HttpAuthHandlerFactory { public: Factory(); virtual ~Factory(); diff --git a/net/http/http_auth_handler_digest.h b/net/http/http_auth_handler_digest.h index 7b0f120..809e346 100644 --- a/net/http/http_auth_handler_digest.h +++ b/net/http/http_auth_handler_digest.h @@ -12,19 +12,19 @@ #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "base/string16.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" #include "net/http/http_auth_handler.h" #include "net/http/http_auth_handler_factory.h" namespace net { // Code for handling http digest authentication. -class NET_TEST HttpAuthHandlerDigest : public HttpAuthHandler { +class NET_EXPORT_PRIVATE HttpAuthHandlerDigest : public HttpAuthHandler { public: // A NonceGenerator is a simple interface for generating client nonces. // Unit tests can override the default client nonce behavior with fixed // nonce generation to get reproducible results. - class NET_TEST NonceGenerator { + class NET_EXPORT_PRIVATE NonceGenerator { public: NonceGenerator(); virtual ~NonceGenerator(); @@ -47,7 +47,7 @@ class NET_TEST HttpAuthHandlerDigest : public HttpAuthHandler { // FixedNonceGenerator always uses the same string specified at // construction time as the client nonce. - class NET_TEST FixedNonceGenerator : public NonceGenerator { + class NET_EXPORT_PRIVATE FixedNonceGenerator : public NonceGenerator { public: explicit FixedNonceGenerator(const std::string& nonce); @@ -58,7 +58,7 @@ class NET_TEST HttpAuthHandlerDigest : public HttpAuthHandler { DISALLOW_COPY_AND_ASSIGN(FixedNonceGenerator); }; - class NET_TEST Factory : public HttpAuthHandlerFactory { + class NET_EXPORT_PRIVATE Factory : public HttpAuthHandlerFactory { public: Factory(); virtual ~Factory(); diff --git a/net/http/http_auth_handler_factory.h b/net/http/http_auth_handler_factory.h index d8cfa1e..644be67 100644 --- a/net/http/http_auth_handler_factory.h +++ b/net/http/http_auth_handler_factory.h @@ -11,7 +11,7 @@ #include <vector> #include "base/memory/scoped_ptr.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" #include "net/http/http_auth.h" #include "net/http/url_security_manager.h" @@ -27,7 +27,7 @@ class HttpAuthHandlerRegistryFactory; // An HttpAuthHandlerFactory is used to create HttpAuthHandler objects. // The HttpAuthHandlerFactory object _must_ outlive any of the HttpAuthHandler // objects that it creates. -class NET_API HttpAuthHandlerFactory { +class NET_EXPORT HttpAuthHandlerFactory { public: enum CreateReason { CREATE_CHALLENGE, // Create a handler in response to a challenge. @@ -126,7 +126,8 @@ class NET_API HttpAuthHandlerFactory { // The HttpAuthHandlerRegistryFactory dispatches create requests out // to other factories based on the auth scheme. -class NET_API HttpAuthHandlerRegistryFactory : public HttpAuthHandlerFactory { +class NET_EXPORT HttpAuthHandlerRegistryFactory + : public HttpAuthHandlerFactory { public: HttpAuthHandlerRegistryFactory(); virtual ~HttpAuthHandlerRegistryFactory(); diff --git a/net/http/http_auth_handler_negotiate.h b/net/http/http_auth_handler_negotiate.h index da2e19b..1727ec8 100644 --- a/net/http/http_auth_handler_negotiate.h +++ b/net/http/http_auth_handler_negotiate.h @@ -11,7 +11,7 @@ #include "base/string16.h" #include "build/build_config.h" #include "net/base/address_list.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" #include "net/http/http_auth_handler.h" #include "net/http/http_auth_handler_factory.h" @@ -32,7 +32,7 @@ class URLSecurityManager; // See http://tools.ietf.org/html/rfc4178 and http://tools.ietf.org/html/rfc4559 // for more information about the protocol. -class NET_TEST HttpAuthHandlerNegotiate : public HttpAuthHandler { +class NET_EXPORT_PRIVATE HttpAuthHandlerNegotiate : public HttpAuthHandler { public: #if defined(OS_WIN) typedef SSPILibrary AuthLibrary; @@ -42,7 +42,7 @@ class NET_TEST HttpAuthHandlerNegotiate : public HttpAuthHandler { typedef HttpAuthGSSAPI AuthSystem; #endif - class NET_TEST Factory : public HttpAuthHandlerFactory { + class NET_EXPORT_PRIVATE Factory : public HttpAuthHandlerFactory { public: Factory(); virtual ~Factory(); diff --git a/net/http/http_auth_handler_ntlm.h b/net/http/http_auth_handler_ntlm.h index 92322f3..828e512 100644 --- a/net/http/http_auth_handler_ntlm.h +++ b/net/http/http_auth_handler_ntlm.h @@ -35,7 +35,7 @@ namespace net { class URLSecurityManager; // Code for handling HTTP NTLM authentication. -class NET_TEST HttpAuthHandlerNTLM : public HttpAuthHandler { +class NET_EXPORT_PRIVATE HttpAuthHandlerNTLM : public HttpAuthHandler { public: class Factory : public HttpAuthHandlerFactory { public: diff --git a/net/http/http_auth_sspi_win.h b/net/http/http_auth_sspi_win.h index 76e33c0..1a6e0af 100644 --- a/net/http/http_auth_sspi_win.h +++ b/net/http/http_auth_sspi_win.h @@ -18,7 +18,7 @@ #include <string> #include "base/string16.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" #include "net/http/http_auth.h" namespace net { @@ -122,7 +122,7 @@ class SSPILibraryDefault : public SSPILibrary { } }; -class NET_TEST HttpAuthSSPI { +class NET_EXPORT_PRIVATE HttpAuthSSPI { public: HttpAuthSSPI(SSPILibrary* sspi_library, const std::string& scheme, @@ -181,9 +181,9 @@ class NET_TEST HttpAuthSSPI { // If |combined| is of form "bar", |domain| will be empty and |user| will // contain "bar". // |domain| and |user| must be non-NULL. -NET_TEST void SplitDomainAndUser(const string16& combined, - string16* domain, - string16* user); +NET_EXPORT_PRIVATE void SplitDomainAndUser(const string16& combined, + string16* domain, + string16* user); // Determines the maximum token length in bytes for a particular SSPI package. // @@ -199,9 +199,9 @@ NET_TEST void SplitDomainAndUser(const string16& combined, // If the return value is ERR_UNEXPECTED, there was an unanticipated problem // in the underlying SSPI call. The details are logged, and |*max_token_length| // is not changed. -NET_TEST int DetermineMaxTokenLength(SSPILibrary* library, - const std::wstring& package, - ULONG* max_token_length); +NET_EXPORT_PRIVATE int DetermineMaxTokenLength(SSPILibrary* library, + const std::wstring& package, + ULONG* max_token_length); } // namespace net diff --git a/net/http/http_byte_range.h b/net/http/http_byte_range.h index 2b5ebea..9181052 100644 --- a/net/http/http_byte_range.h +++ b/net/http/http_byte_range.h @@ -7,14 +7,14 @@ #pragma once #include "base/basictypes.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" namespace net { // A container class that represents a "range" specified for range request // specified by RFC 2616 Section 14.35.1. // http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35.1 -class NET_API HttpByteRange { +class NET_EXPORT HttpByteRange { public: HttpByteRange(); diff --git a/net/http/http_cache.h b/net/http/http_cache.h index 1dc274d..876418e 100644 --- a/net/http/http_cache.h +++ b/net/http/http_cache.h @@ -30,7 +30,7 @@ #include "net/base/cache_type.h" #include "net/base/completion_callback.h" #include "net/base/load_states.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" #include "net/http/http_transaction_factory.h" class GURL; @@ -58,9 +58,9 @@ class ProxyService; class SSLConfigService; class ViewCacheHelper; -class NET_API HttpCache : public HttpTransactionFactory, - public base::SupportsWeakPtr<HttpCache>, - NON_EXPORTED_BASE(public base::NonThreadSafe) { +class NET_EXPORT HttpCache : public HttpTransactionFactory, + public base::SupportsWeakPtr<HttpCache>, + NON_EXPORTED_BASE(public base::NonThreadSafe) { public: // The cache mode of operation. enum Mode { @@ -77,7 +77,7 @@ class NET_API HttpCache : public HttpTransactionFactory, }; // A BackendFactory creates a backend object to be used by the HttpCache. - class NET_API BackendFactory { + class NET_EXPORT BackendFactory { public: virtual ~BackendFactory() {} @@ -93,7 +93,7 @@ class NET_API HttpCache : public HttpTransactionFactory, }; // A default backend factory for the common use cases. - class NET_API DefaultBackend : public BackendFactory { + class NET_EXPORT DefaultBackend : public BackendFactory { public: // |path| is the destination for any files used by the backend, and // |cache_thread| is the thread where disk operations should take place. If diff --git a/net/http/http_chunked_decoder.h b/net/http/http_chunked_decoder.h index 8097e48..1ec8b4b 100644 --- a/net/http/http_chunked_decoder.h +++ b/net/http/http_chunked_decoder.h @@ -48,7 +48,7 @@ #include <string> -#include "net/base/net_api.h" +#include "net/base/net_export.h" namespace net { @@ -76,7 +76,7 @@ namespace net { // NOTE: This implementation does not bother to parse trailers since they are // not used on the web. // -class NET_TEST HttpChunkedDecoder { +class NET_EXPORT_PRIVATE HttpChunkedDecoder { public: HttpChunkedDecoder(); diff --git a/net/http/http_mac_signature.h b/net/http/http_mac_signature.h index 7a1e971..5835656 100644 --- a/net/http/http_mac_signature.h +++ b/net/http/http_mac_signature.h @@ -12,7 +12,7 @@ #include "base/gtest_prod_util.h" #include "base/time.h" #include "crypto/hmac.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" namespace net { @@ -22,7 +22,7 @@ namespace net { // // http://tools.ietf.org/html/draft-hammer-oauth-v2-mac-token // -class NET_TEST HttpMacSignature { +class NET_EXPORT_PRIVATE HttpMacSignature { public: HttpMacSignature(); ~HttpMacSignature(); diff --git a/net/http/http_network_layer.h b/net/http/http_network_layer.h index 448ae8d..0b51889 100644 --- a/net/http/http_network_layer.h +++ b/net/http/http_network_layer.h @@ -12,7 +12,7 @@ #include "base/memory/scoped_ptr.h" #include "base/system_monitor/system_monitor.h" #include "base/threading/non_thread_safe.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" #include "net/http/http_transaction_factory.h" namespace net { @@ -31,9 +31,10 @@ class SpdySessionPool; class SSLConfigService; class SSLHostInfoFactory; -class NET_API HttpNetworkLayer : public HttpTransactionFactory, - public base::SystemMonitor::PowerObserver, - NON_EXPORTED_BASE(public base::NonThreadSafe) { +class NET_EXPORT HttpNetworkLayer + : public HttpTransactionFactory, + public base::SystemMonitor::PowerObserver, + NON_EXPORTED_BASE(public base::NonThreadSafe) { public: // Construct a HttpNetworkLayer with an existing HttpNetworkSession which // contains a valid ProxyService. diff --git a/net/http/http_network_session.h b/net/http/http_network_session.h index 373979f..d4e391e 100644 --- a/net/http/http_network_session.h +++ b/net/http/http_network_session.h @@ -11,7 +11,7 @@ #include "base/threading/non_thread_safe.h" #include "net/base/host_port_pair.h" #include "net/base/host_resolver.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" #include "net/base/ssl_client_auth_cache.h" #include "net/http/http_alternate_protocols.h" #include "net/http/http_auth_cache.h" @@ -42,11 +42,11 @@ class SSLConfigService; class SSLHostInfoFactory; // This class holds session objects used by HttpNetworkTransaction objects. -class NET_API HttpNetworkSession +class NET_EXPORT HttpNetworkSession : public base::RefCounted<HttpNetworkSession>, NON_EXPORTED_BASE(public base::NonThreadSafe) { public: - struct NET_API Params { + struct NET_EXPORT Params { Params() : client_socket_factory(NULL), host_resolver(NULL), diff --git a/net/http/http_network_session_peer.h b/net/http/http_network_session_peer.h index 2b610ba..d58d560 100644 --- a/net/http/http_network_session_peer.h +++ b/net/http/http_network_session_peer.h @@ -7,7 +7,7 @@ #pragma once #include "base/memory/ref_counted.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" namespace net { @@ -20,7 +20,7 @@ class SOCKSClientSocketPool; class SSLClientSocketPool; class TransportClientSocketPool; -class NET_TEST HttpNetworkSessionPeer { +class NET_EXPORT_PRIVATE HttpNetworkSessionPeer { public: explicit HttpNetworkSessionPeer( const scoped_refptr<HttpNetworkSession>& session); diff --git a/net/http/http_network_transaction.h b/net/http/http_network_transaction.h index 0011262..6f6ba77 100644 --- a/net/http/http_network_transaction.h +++ b/net/http/http_network_transaction.h @@ -32,8 +32,9 @@ class HttpStreamRequest; class IOBuffer; struct HttpRequestInfo; -class NET_TEST HttpNetworkTransaction : public HttpTransaction, - public HttpStreamRequest::Delegate { +class NET_EXPORT_PRIVATE HttpNetworkTransaction + : public HttpTransaction, + public HttpStreamRequest::Delegate { public: explicit HttpNetworkTransaction(HttpNetworkSession* session); diff --git a/net/http/http_proxy_client_socket_pool.h b/net/http/http_proxy_client_socket_pool.h index c3dc24b..07f67b0 100644 --- a/net/http/http_proxy_client_socket_pool.h +++ b/net/http/http_proxy_client_socket_pool.h @@ -13,7 +13,7 @@ #include "base/memory/scoped_ptr.h" #include "base/time.h" #include "net/base/host_port_pair.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" #include "net/http/http_auth.h" #include "net/http/http_response_info.h" #include "net/http/proxy_client_socket.h" @@ -37,7 +37,7 @@ class TransportSocketParams; // types. The other param must be NULL. When using an HTTP Proxy, // |transport_params| must be set. When using an HTTPS Proxy, |ssl_params| // must be set. -class NET_TEST HttpProxySocketParams +class NET_EXPORT_PRIVATE HttpProxySocketParams : public base::RefCounted<HttpProxySocketParams> { public: HttpProxySocketParams( @@ -167,7 +167,7 @@ class HttpProxyConnectJob : public ConnectJob { DISALLOW_COPY_AND_ASSIGN(HttpProxyConnectJob); }; -class NET_TEST HttpProxyClientSocketPool : public ClientSocketPool { +class NET_EXPORT_PRIVATE HttpProxyClientSocketPool : public ClientSocketPool { public: HttpProxyClientSocketPool( int max_sockets, diff --git a/net/http/http_request_headers.h b/net/http/http_request_headers.h index e214d6c..cfb2748 100644 --- a/net/http/http_request_headers.h +++ b/net/http/http_request_headers.h @@ -16,11 +16,11 @@ #include "base/basictypes.h" #include "base/string_piece.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" namespace net { -class NET_API HttpRequestHeaders { +class NET_EXPORT HttpRequestHeaders { public: struct HeaderKeyValuePair { HeaderKeyValuePair(); @@ -33,7 +33,7 @@ class NET_API HttpRequestHeaders { typedef std::vector<HeaderKeyValuePair> HeaderVector; - class NET_API Iterator { + class NET_EXPORT Iterator { public: explicit Iterator(const HttpRequestHeaders& headers); ~Iterator(); diff --git a/net/http/http_request_info.h b/net/http/http_request_info.h index c368685..77e12c5 100644 --- a/net/http/http_request_info.h +++ b/net/http/http_request_info.h @@ -9,14 +9,14 @@ #include <string> #include "base/memory/ref_counted.h" #include "googleurl/src/gurl.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" #include "net/base/request_priority.h" #include "net/base/upload_data.h" #include "net/http/http_request_headers.h" namespace net { -struct NET_API HttpRequestInfo { +struct NET_EXPORT HttpRequestInfo { enum RequestMotivation{ // TODO(mbelshe): move these into Client Socket. PRECONNECT_MOTIVATED, // Request was motivated by a prefetch. diff --git a/net/http/http_response_body_drainer.h b/net/http/http_response_body_drainer.h index 27b982f..57cfc5c 100644 --- a/net/http/http_response_body_drainer.h +++ b/net/http/http_response_body_drainer.h @@ -11,7 +11,7 @@ #include "base/memory/scoped_ptr.h" #include "base/timer.h" #include "net/base/completion_callback.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" #include "net/http/http_network_session.h" namespace net { @@ -19,7 +19,7 @@ namespace net { class HttpStream; class IOBuffer; -class NET_TEST HttpResponseBodyDrainer { +class NET_EXPORT_PRIVATE HttpResponseBodyDrainer { public: // The size in bytes of the buffer we use to drain the response body that // we want to throw away. The response body is typically a small page just a diff --git a/net/http/http_response_headers.h b/net/http/http_response_headers.h index a9a97980..a1b9dfa 100644 --- a/net/http/http_response_headers.h +++ b/net/http/http_response_headers.h @@ -12,7 +12,7 @@ #include "base/basictypes.h" #include "base/hash_tables.h" #include "base/memory/ref_counted.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" #include "net/http/http_version.h" class Pickle; @@ -25,7 +25,7 @@ class TimeDelta; namespace net { // HttpResponseHeaders: parses and holds HTTP response headers. -class NET_API HttpResponseHeaders +class NET_EXPORT HttpResponseHeaders : public base::RefCountedThreadSafe<HttpResponseHeaders> { public: // Persist options. diff --git a/net/http/http_response_info.h b/net/http/http_response_info.h index 17de962..6ee93a1 100644 --- a/net/http/http_response_info.h +++ b/net/http/http_response_info.h @@ -7,8 +7,8 @@ #pragma once #include "base/time.h" -#include "net/base/net_api.h" #include "net/base/host_port_pair.h" +#include "net/base/net_export.h" #include "net/base/ssl_info.h" #include "net/http/http_vary_data.h" @@ -21,7 +21,7 @@ class HttpResponseHeaders; class IOBufferWithSize; class SSLCertRequestInfo; -class NET_API HttpResponseInfo { +class NET_EXPORT HttpResponseInfo { public: HttpResponseInfo(); HttpResponseInfo(const HttpResponseInfo& rhs); diff --git a/net/http/http_stream.h b/net/http/http_stream.h index 66fd97c..45dc46c 100644 --- a/net/http/http_stream.h +++ b/net/http/http_stream.h @@ -18,7 +18,7 @@ #include "base/basictypes.h" #include "net/base/completion_callback.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" namespace net { @@ -31,7 +31,7 @@ class SSLCertRequestInfo; class SSLInfo; class UploadDataStream; -class NET_TEST HttpStream { +class NET_EXPORT_PRIVATE HttpStream { public: HttpStream() {} virtual ~HttpStream() {} diff --git a/net/http/http_stream_factory.h b/net/http/http_stream_factory.h index a1b51680..097915e 100644 --- a/net/http/http_stream_factory.h +++ b/net/http/http_stream_factory.h @@ -12,7 +12,7 @@ #include "base/string16.h" #include "net/base/completion_callback.h" #include "net/base/load_states.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" class GURL; @@ -38,12 +38,12 @@ struct SSLConfig; // created, this object is the creator's handle for interacting with the // HttpStream creation process. The request is cancelled by deleting it, after // which no callbacks will be invoked. -class NET_TEST HttpStreamRequest { +class NET_EXPORT_PRIVATE HttpStreamRequest { public: // The HttpStreamRequest::Delegate is a set of callback methods for a // HttpStreamRequestJob. Generally, only one of these methods will be // called as a result of a stream request. - class NET_TEST Delegate { + class NET_EXPORT_PRIVATE Delegate { public: virtual ~Delegate() {} @@ -144,7 +144,7 @@ class NET_TEST HttpStreamRequest { }; // The HttpStreamFactory defines an interface for creating usable HttpStreams. -class NET_API HttpStreamFactory { +class NET_EXPORT HttpStreamFactory { public: virtual ~HttpStreamFactory(); diff --git a/net/http/http_stream_factory_impl.h b/net/http/http_stream_factory_impl.h index 3e58c0c..4a46181 100644 --- a/net/http/http_stream_factory_impl.h +++ b/net/http/http_stream_factory_impl.h @@ -19,7 +19,7 @@ namespace net { class HttpNetworkSession; class SpdySession; -class NET_TEST HttpStreamFactoryImpl : public HttpStreamFactory { +class NET_EXPORT_PRIVATE HttpStreamFactoryImpl : public HttpStreamFactory { public: explicit HttpStreamFactoryImpl(HttpNetworkSession* session); virtual ~HttpStreamFactoryImpl(); diff --git a/net/http/http_transaction.h b/net/http/http_transaction.h index 8f4a984..400c91f 100644 --- a/net/http/http_transaction.h +++ b/net/http/http_transaction.h @@ -9,7 +9,7 @@ #include "base/string16.h" #include "net/base/completion_callback.h" #include "net/base/load_states.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" namespace net { @@ -23,7 +23,7 @@ class SSLHostInfo; // Represents a single HTTP transaction (i.e., a single request/response pair). // HTTP redirects are not followed and authentication challenges are not // answered. Cookies are assumed to be managed by the caller. -class NET_TEST HttpTransaction { +class NET_EXPORT_PRIVATE HttpTransaction { public: // Stops any pending IO and destroys the transaction object. virtual ~HttpTransaction() {} diff --git a/net/http/http_transaction_factory.h b/net/http/http_transaction_factory.h index 2dcb9f8..288911f 100644 --- a/net/http/http_transaction_factory.h +++ b/net/http/http_transaction_factory.h @@ -7,7 +7,7 @@ #pragma once #include "base/memory/scoped_ptr.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" namespace net { @@ -17,7 +17,7 @@ class HttpTransaction; // An interface to a class that can create HttpTransaction objects. -class NET_API HttpTransactionFactory { +class NET_EXPORT HttpTransactionFactory { public: virtual ~HttpTransactionFactory() {} diff --git a/net/http/http_util.h b/net/http/http_util.h index f9a316f..e9e025e 100644 --- a/net/http/http_util.h +++ b/net/http/http_util.h @@ -12,7 +12,7 @@ #include "base/memory/ref_counted.h" #include "base/string_tokenizer.h" #include "googleurl/src/gurl.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" #include "net/http/http_byte_range.h" // This is a macro to support extending this string literal at compile time. @@ -23,7 +23,7 @@ namespace net { class UploadDataStream; -class NET_API HttpUtil { +class NET_EXPORT HttpUtil { public: // Returns the absolute path of the URL, to be used for the http request. // The absolute path starts with a '/' and may contain a query. @@ -171,7 +171,7 @@ class NET_API HttpUtil { // over the values in a multi-value header, use ValuesIterator. // See AssembleRawHeaders for joining line continuations (this iterator // does not expect any). - class NET_API HeadersIterator { + class NET_EXPORT HeadersIterator { public: HeadersIterator(std::string::const_iterator headers_begin, std::string::const_iterator headers_end, @@ -234,7 +234,7 @@ class NET_API HttpUtil { // This iterator is careful to skip over delimiters found inside an HTTP // quoted string. // - class NET_TEST ValuesIterator { + class NET_EXPORT_PRIVATE ValuesIterator { public: ValuesIterator(std::string::const_iterator values_begin, std::string::const_iterator values_end, @@ -268,7 +268,7 @@ class NET_API HttpUtil { // // String iterators returned from this class' methods may be invalidated upon // calls to GetNext() or after the NameValuePairsIterator is destroyed. - class NET_API NameValuePairsIterator { + class NET_EXPORT NameValuePairsIterator { public: NameValuePairsIterator(std::string::const_iterator begin, std::string::const_iterator end, diff --git a/net/http/http_vary_data.h b/net/http/http_vary_data.h index 5bc2c70..baa4d88 100644 --- a/net/http/http_vary_data.h +++ b/net/http/http_vary_data.h @@ -7,7 +7,7 @@ #pragma once #include "base/md5.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" class Pickle; @@ -28,7 +28,7 @@ class HttpResponseHeaders; // Instead, it relies on the consumer to store that and to supply it again to // the MatchesRequest function for comparing against future HTTP requests. // -class NET_TEST HttpVaryData { +class NET_EXPORT_PRIVATE HttpVaryData { public: HttpVaryData(); diff --git a/net/http/proxy_client_socket.h b/net/http/proxy_client_socket.h index 73197be..451e098 100644 --- a/net/http/proxy_client_socket.h +++ b/net/http/proxy_client_socket.h @@ -13,7 +13,7 @@ namespace net { class HttpStream; class HttpResponseInfo; -class NET_TEST ProxyClientSocket : public StreamSocket { +class NET_EXPORT_PRIVATE ProxyClientSocket : public StreamSocket { public: ProxyClientSocket() {} virtual ~ProxyClientSocket() {} diff --git a/net/http/url_security_manager.h b/net/http/url_security_manager.h index 571a1ba..ce990c6 100644 --- a/net/http/url_security_manager.h +++ b/net/http/url_security_manager.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" class GURL; @@ -18,7 +18,7 @@ class HttpAuthFilter; // The URL security manager controls the policies (allow, deny, prompt user) // regarding URL actions (e.g., sending the default credentials to a server). -class NET_API URLSecurityManager { +class NET_EXPORT URLSecurityManager { public: URLSecurityManager() {} virtual ~URLSecurityManager() {} |