diff options
-rw-r--r-- | net/http/http_byte_range.h | 5 | ||||
-rw-r--r-- | net/http/http_cache.h | 11 | ||||
-rw-r--r-- | net/http/http_chunked_decoder.h | 6 | ||||
-rw-r--r-- | net/http/http_network_layer.h | 5 | ||||
-rw-r--r-- | net/http/http_network_session_peer.h | 3 | ||||
-rw-r--r-- | net/http/http_network_transaction.h | 4 | ||||
-rw-r--r-- | net/http/http_request_headers.h | 4 | ||||
-rw-r--r-- | net/http/http_request_info.h | 3 | ||||
-rw-r--r-- | net/http/http_response_body_drainer.h | 3 | ||||
-rw-r--r-- | net/http/http_response_headers.h | 3 | ||||
-rw-r--r-- | net/http/http_response_info.h | 5 | ||||
-rw-r--r-- | net/http/http_stream.h | 3 | ||||
-rw-r--r-- | net/http/http_stream_factory.h | 7 | ||||
-rw-r--r-- | net/http/http_stream_factory_impl.h | 2 | ||||
-rw-r--r-- | net/http/http_transaction.h | 5 | ||||
-rw-r--r-- | net/http/http_util.h | 9 | ||||
-rw-r--r-- | net/http/http_vary_data.h | 5 |
17 files changed, 50 insertions, 33 deletions
diff --git a/net/http/http_byte_range.h b/net/http/http_byte_range.h index 5b0a9d1..2b5ebea 100644 --- a/net/http/http_byte_range.h +++ b/net/http/http_byte_range.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,13 +7,14 @@ #pragma once #include "base/basictypes.h" +#include "net/base/net_api.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 HttpByteRange { +class NET_API HttpByteRange { public: HttpByteRange(); diff --git a/net/http/http_cache.h b/net/http/http_cache.h index f1c5fbe..5728dbd 100644 --- a/net/http/http_cache.h +++ b/net/http/http_cache.h @@ -30,6 +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/http/http_transaction_factory.h" class GURL; @@ -56,9 +57,9 @@ class ProxyService; class SSLConfigService; class ViewCacheHelper; -class HttpCache : public HttpTransactionFactory, - public base::SupportsWeakPtr<HttpCache>, - public base::NonThreadSafe { +class NET_API HttpCache : public HttpTransactionFactory, + public base::SupportsWeakPtr<HttpCache>, + NON_EXPORTED_BASE(public base::NonThreadSafe) { public: // The cache mode of operation. enum Mode { @@ -75,7 +76,7 @@ class HttpCache : public HttpTransactionFactory, }; // A BackendFactory creates a backend object to be used by the HttpCache. - class BackendFactory { + class NET_API BackendFactory { public: virtual ~BackendFactory() {} @@ -91,7 +92,7 @@ class HttpCache : public HttpTransactionFactory, }; // A default backend factory for the common use cases. - class DefaultBackend : public BackendFactory { + class NET_API 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 837499c..8097e48 100644 --- a/net/http/http_chunked_decoder.h +++ b/net/http/http_chunked_decoder.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -48,6 +48,8 @@ #include <string> +#include "net/base/net_api.h" + namespace net { // From RFC2617 section 3.6.1, the chunked transfer coding is defined as: @@ -74,7 +76,7 @@ namespace net { // NOTE: This implementation does not bother to parse trailers since they are // not used on the web. // -class HttpChunkedDecoder { +class NET_TEST HttpChunkedDecoder { public: HttpChunkedDecoder(); diff --git a/net/http/http_network_layer.h b/net/http/http_network_layer.h index f4843fe..35652c3 100644 --- a/net/http/http_network_layer.h +++ b/net/http/http_network_layer.h @@ -11,6 +11,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/threading/non_thread_safe.h" +#include "net/base/net_api.h" #include "net/http/http_transaction_factory.h" namespace net { @@ -29,8 +30,8 @@ class SpdySessionPool; class SSLConfigService; class SSLHostInfoFactory; -class HttpNetworkLayer : public HttpTransactionFactory, - public base::NonThreadSafe { +class NET_API HttpNetworkLayer : public HttpTransactionFactory, + 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_peer.h b/net/http/http_network_session_peer.h index 51b1f81..2b610ba 100644 --- a/net/http/http_network_session_peer.h +++ b/net/http/http_network_session_peer.h @@ -7,6 +7,7 @@ #pragma once #include "base/memory/ref_counted.h" +#include "net/base/net_api.h" namespace net { @@ -19,7 +20,7 @@ class SOCKSClientSocketPool; class SSLClientSocketPool; class TransportClientSocketPool; -class HttpNetworkSessionPeer { +class NET_TEST 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 1b73b1f..0011262 100644 --- a/net/http/http_network_transaction.h +++ b/net/http/http_network_transaction.h @@ -32,8 +32,8 @@ class HttpStreamRequest; class IOBuffer; struct HttpRequestInfo; -class HttpNetworkTransaction : public HttpTransaction, - public HttpStreamRequest::Delegate { +class NET_TEST HttpNetworkTransaction : public HttpTransaction, + public HttpStreamRequest::Delegate { public: explicit HttpNetworkTransaction(HttpNetworkSession* session); diff --git a/net/http/http_request_headers.h b/net/http/http_request_headers.h index 4b05dfe..5d60776 100644 --- a/net/http/http_request_headers.h +++ b/net/http/http_request_headers.h @@ -13,12 +13,14 @@ #include <string> #include <vector> + #include "base/basictypes.h" #include "base/string_piece.h" +#include "net/base/net_api.h" namespace net { -class HttpRequestHeaders { +class NET_API HttpRequestHeaders { public: struct HeaderKeyValuePair { HeaderKeyValuePair(); diff --git a/net/http/http_request_info.h b/net/http/http_request_info.h index b906cf5..96c47c0 100644 --- a/net/http/http_request_info.h +++ b/net/http/http_request_info.h @@ -9,13 +9,14 @@ #include <string> #include "base/memory/ref_counted.h" #include "googleurl/src/gurl.h" +#include "net/base/net_api.h" #include "net/base/request_priority.h" #include "net/base/upload_data.h" #include "net/http/http_request_headers.h" namespace net { -struct HttpRequestInfo { +struct NET_API 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 7ee1d7c..27b982f 100644 --- a/net/http/http_response_body_drainer.h +++ b/net/http/http_response_body_drainer.h @@ -11,6 +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/http/http_network_session.h" namespace net { @@ -18,7 +19,7 @@ namespace net { class HttpStream; class IOBuffer; -class HttpResponseBodyDrainer { +class NET_TEST 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 7187da5..a9a97980 100644 --- a/net/http/http_response_headers.h +++ b/net/http/http_response_headers.h @@ -12,6 +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/http/http_version.h" class Pickle; @@ -24,7 +25,7 @@ class TimeDelta; namespace net { // HttpResponseHeaders: parses and holds HTTP response headers. -class HttpResponseHeaders +class NET_API 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 c925aa9..17de962 100644 --- a/net/http/http_response_info.h +++ b/net/http/http_response_info.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,6 +7,7 @@ #pragma once #include "base/time.h" +#include "net/base/net_api.h" #include "net/base/host_port_pair.h" #include "net/base/ssl_info.h" #include "net/http/http_vary_data.h" @@ -20,7 +21,7 @@ class HttpResponseHeaders; class IOBufferWithSize; class SSLCertRequestInfo; -class HttpResponseInfo { +class NET_API HttpResponseInfo { public: HttpResponseInfo(); HttpResponseInfo(const HttpResponseInfo& rhs); diff --git a/net/http/http_stream.h b/net/http/http_stream.h index fed64655..7ca2203 100644 --- a/net/http/http_stream.h +++ b/net/http/http_stream.h @@ -18,6 +18,7 @@ #include "base/basictypes.h" #include "net/base/completion_callback.h" +#include "net/base/net_api.h" namespace net { @@ -30,7 +31,7 @@ class SSLCertRequestInfo; class SSLInfo; class UploadDataStream; -class HttpStream { +class NET_TEST HttpStream { public: HttpStream() {} virtual ~HttpStream() {} diff --git a/net/http/http_stream_factory.h b/net/http/http_stream_factory.h index 4375f3f..a1b51680 100644 --- a/net/http/http_stream_factory.h +++ b/net/http/http_stream_factory.h @@ -12,6 +12,7 @@ #include "base/string16.h" #include "net/base/completion_callback.h" #include "net/base/load_states.h" +#include "net/base/net_api.h" class GURL; @@ -37,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 HttpStreamRequest { +class NET_TEST 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 Delegate { + class NET_TEST Delegate { public: virtual ~Delegate() {} @@ -143,7 +144,7 @@ class HttpStreamRequest { }; // The HttpStreamFactory defines an interface for creating usable HttpStreams. -class HttpStreamFactory { +class NET_API HttpStreamFactory { public: virtual ~HttpStreamFactory(); diff --git a/net/http/http_stream_factory_impl.h b/net/http/http_stream_factory_impl.h index 93e8c57..3e58c0c 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 HttpStreamFactoryImpl : public HttpStreamFactory { +class NET_TEST 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 1923851..8f4a984 100644 --- a/net/http/http_transaction.h +++ b/net/http/http_transaction.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,6 +9,7 @@ #include "base/string16.h" #include "net/base/completion_callback.h" #include "net/base/load_states.h" +#include "net/base/net_api.h" namespace net { @@ -22,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 HttpTransaction { +class NET_TEST HttpTransaction { public: // Stops any pending IO and destroys the transaction object. virtual ~HttpTransaction() {} diff --git a/net/http/http_util.h b/net/http/http_util.h index b61d140..f9a316f 100644 --- a/net/http/http_util.h +++ b/net/http/http_util.h @@ -12,6 +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/http/http_byte_range.h" // This is a macro to support extending this string literal at compile time. @@ -22,7 +23,7 @@ namespace net { class UploadDataStream; -class HttpUtil { +class NET_API 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. @@ -170,7 +171,7 @@ class HttpUtil { // over the values in a multi-value header, use ValuesIterator. // See AssembleRawHeaders for joining line continuations (this iterator // does not expect any). - class HeadersIterator { + class NET_API HeadersIterator { public: HeadersIterator(std::string::const_iterator headers_begin, std::string::const_iterator headers_end, @@ -233,7 +234,7 @@ class HttpUtil { // This iterator is careful to skip over delimiters found inside an HTTP // quoted string. // - class ValuesIterator { + class NET_TEST ValuesIterator { public: ValuesIterator(std::string::const_iterator values_begin, std::string::const_iterator values_end, @@ -267,7 +268,7 @@ class HttpUtil { // // String iterators returned from this class' methods may be invalidated upon // calls to GetNext() or after the NameValuePairsIterator is destroyed. - class NameValuePairsIterator { + class NET_API 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 7e5cbb9..876d867 100644 --- a/net/http/http_vary_data.h +++ b/net/http/http_vary_data.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,6 +7,7 @@ #pragma once #include "base/md5.h" +#include "net/base/net_api.h" class Pickle; @@ -27,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 HttpVaryData { +class NET_TEST HttpVaryData { public: HttpVaryData(); |