diff options
author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-12 15:52:26 +0000 |
---|---|---|
committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-12 15:52:26 +0000 |
commit | 172da1b80ab1d9ec5428f04919f1bed13a37e3dc (patch) | |
tree | 4ee0eaf3d734a20b208de30616123ad7621abf5a /net/proxy | |
parent | 8b615de52644092891367b304f3b4663cc6daba6 (diff) | |
download | chromium_src-172da1b80ab1d9ec5428f04919f1bed13a37e3dc.zip chromium_src-172da1b80ab1d9ec5428f04919f1bed13a37e3dc.tar.gz chromium_src-172da1b80ab1d9ec5428f04919f1bed13a37e3dc.tar.bz2 |
Rename NET_API to NET_EXPORT, and rename NET_TEST to NET_EXPORT_PRIVATE.
Review URL: http://codereview.chromium.org/7529043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96560 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy')
29 files changed, 61 insertions, 60 deletions
diff --git a/net/proxy/dhcp_proxy_script_adapter_fetcher_win.h b/net/proxy/dhcp_proxy_script_adapter_fetcher_win.h index f650773..3bbbaa8 100644 --- a/net/proxy/dhcp_proxy_script_adapter_fetcher_win.h +++ b/net/proxy/dhcp_proxy_script_adapter_fetcher_win.h @@ -13,7 +13,7 @@ #include "base/threading/non_thread_safe.h" #include "base/timer.h" #include "net/base/completion_callback.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" #include "googleurl/src/gurl.h" namespace base { @@ -27,7 +27,7 @@ class URLRequestContext; // For a given adapter, this class takes care of first doing a DHCP lookup // to get the PAC URL, then if there is one, trying to fetch it. -class NET_TEST DhcpProxyScriptAdapterFetcher +class NET_EXPORT_PRIVATE DhcpProxyScriptAdapterFetcher : public base::SupportsWeakPtr<DhcpProxyScriptAdapterFetcher>, NON_EXPORTED_BASE(public base::NonThreadSafe) { public: @@ -114,7 +114,7 @@ class NET_TEST DhcpProxyScriptAdapterFetcher // // TODO(joi): Replace with PostTaskAndReply once http://crbug.com/86301 // has been implemented. - class NET_TEST WorkerThread + class NET_EXPORT_PRIVATE WorkerThread : public base::RefCountedThreadSafe<WorkerThread> { public: // Creates and initializes (but does not start) the worker thread. diff --git a/net/proxy/dhcp_proxy_script_fetcher.h b/net/proxy/dhcp_proxy_script_fetcher.h index 2d07303..13e5c34 100644 --- a/net/proxy/dhcp_proxy_script_fetcher.h +++ b/net/proxy/dhcp_proxy_script_fetcher.h @@ -10,7 +10,7 @@ #include "base/compiler_specific.h" #include "base/string16.h" #include "net/base/completion_callback.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" #include "net/proxy/proxy_script_fetcher.h" #include "net/url_request/url_request_context.h" @@ -24,7 +24,7 @@ namespace net { // Normally there are zero or one DHCP scripts configured, but in the // presence of multiple adapters with DHCP enabled, the fetcher resolves // which PAC script to use if one or more are available. -class NET_TEST DhcpProxyScriptFetcher { +class NET_EXPORT_PRIVATE DhcpProxyScriptFetcher { public: // Destruction should cancel any outstanding requests. virtual ~DhcpProxyScriptFetcher(); @@ -80,7 +80,8 @@ class NET_TEST DhcpProxyScriptFetcher { // A do-nothing retriever, always returns synchronously with // ERR_NOT_IMPLEMENTED result and empty text. -class NET_TEST DoNothingDhcpProxyScriptFetcher : public DhcpProxyScriptFetcher { +class NET_EXPORT_PRIVATE DoNothingDhcpProxyScriptFetcher + : public DhcpProxyScriptFetcher { public: DoNothingDhcpProxyScriptFetcher(); virtual ~DoNothingDhcpProxyScriptFetcher(); diff --git a/net/proxy/dhcp_proxy_script_fetcher_factory.h b/net/proxy/dhcp_proxy_script_fetcher_factory.h index 273f321..f234a73 100644 --- a/net/proxy/dhcp_proxy_script_fetcher_factory.h +++ b/net/proxy/dhcp_proxy_script_fetcher_factory.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/memory/singleton.h" #include "net/base/completion_callback.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" #include "net/url_request/url_request_context.h" namespace net { @@ -30,7 +30,7 @@ class DhcpProxyScriptFetcher; // // Therefore, we have platform-specific implementations, and so we use // this factory to select the right one. -class NET_API DhcpProxyScriptFetcherFactory { +class NET_EXPORT DhcpProxyScriptFetcherFactory { public: // Creates a new factory object with default settings. DhcpProxyScriptFetcherFactory(); diff --git a/net/proxy/dhcp_proxy_script_fetcher_win.h b/net/proxy/dhcp_proxy_script_fetcher_win.h index ae9548a..2b10849 100644 --- a/net/proxy/dhcp_proxy_script_fetcher_win.h +++ b/net/proxy/dhcp_proxy_script_fetcher_win.h @@ -23,7 +23,7 @@ class DhcpProxyScriptAdapterFetcher; class URLRequestContext; // Windows-specific implementation. -class NET_TEST DhcpProxyScriptFetcherWin +class NET_EXPORT_PRIVATE DhcpProxyScriptFetcherWin : public DhcpProxyScriptFetcher, public base::SupportsWeakPtr<DhcpProxyScriptFetcherWin>, NON_EXPORTED_BASE(public base::NonThreadSafe) { @@ -56,7 +56,7 @@ class NET_TEST DhcpProxyScriptFetcherWin // // TODO(joi): Replace with PostTaskAndReply once http://crbug.com/86301 // has been implemented. - class NET_TEST WorkerThread + class NET_EXPORT_PRIVATE WorkerThread : public base::RefCountedThreadSafe<WorkerThread> { public: // Creates and initializes (but does not start) the worker thread. diff --git a/net/proxy/init_proxy_resolver.h b/net/proxy/init_proxy_resolver.h index 7d8ebbc..2f90b7e 100644 --- a/net/proxy/init_proxy_resolver.h +++ b/net/proxy/init_proxy_resolver.h @@ -14,7 +14,7 @@ #include "base/timer.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" namespace net { @@ -42,7 +42,7 @@ class URLRequestContext; // Deleting InitProxyResolver while Init() is in progress, will // cancel the request. // -class NET_TEST InitProxyResolver { +class NET_EXPORT_PRIVATE InitProxyResolver { public: // |resolver|, |proxy_script_fetcher|, |dhcp_proxy_script_fetcher| and // |net_log| must remain valid for the lifespan of InitProxyResolver. diff --git a/net/proxy/multi_threaded_proxy_resolver.h b/net/proxy/multi_threaded_proxy_resolver.h index 42e050c..2c18321 100644 --- a/net/proxy/multi_threaded_proxy_resolver.h +++ b/net/proxy/multi_threaded_proxy_resolver.h @@ -13,7 +13,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/base/net_export.h" #include "net/proxy/proxy_resolver.h" namespace base { @@ -72,7 +72,7 @@ class ProxyResolverFactory { // a global counter and using that to make a decision. In the // multi-threaded model, each thread may have a different value for this // counter, so it won't globally be seen as monotonically increasing! -class NET_TEST MultiThreadedProxyResolver +class NET_EXPORT_PRIVATE MultiThreadedProxyResolver : public ProxyResolver, NON_EXPORTED_BASE(public base::NonThreadSafe) { public: diff --git a/net/proxy/network_delegate_error_observer.h b/net/proxy/network_delegate_error_observer.h index 7be1ba1..517cddf 100644 --- a/net/proxy/network_delegate_error_observer.h +++ b/net/proxy/network_delegate_error_observer.h @@ -20,7 +20,7 @@ class NetworkDelegate; // An implementation of ProxyResolverErrorObserver that forwards PAC script // errors to a NetworkDelegate object on the thread it lives on. -class NET_TEST NetworkDelegateErrorObserver +class NET_EXPORT_PRIVATE NetworkDelegateErrorObserver : public ProxyResolverErrorObserver { public: NetworkDelegateErrorObserver(NetworkDelegate* network_delegate, diff --git a/net/proxy/polling_proxy_config_service.h b/net/proxy/polling_proxy_config_service.h index 6dbdb07..dd59d8f 100644 --- a/net/proxy/polling_proxy_config_service.h +++ b/net/proxy/polling_proxy_config_service.h @@ -18,7 +18,7 @@ namespace net { // // It runs code to get the current proxy settings on a background worker // thread, and notifies registered observers when the value changes. -class NET_TEST PollingProxyConfigService : public ProxyConfigService { +class NET_EXPORT_PRIVATE PollingProxyConfigService : public ProxyConfigService { public: // ProxyConfigService implementation: virtual void AddObserver(Observer* observer) OVERRIDE; diff --git a/net/proxy/proxy_bypass_rules.h b/net/proxy/proxy_bypass_rules.h index 212ee5f..814b70f 100644 --- a/net/proxy/proxy_bypass_rules.h +++ b/net/proxy/proxy_bypass_rules.h @@ -10,17 +10,17 @@ #include <vector> #include "googleurl/src/gurl.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" namespace net { // ProxyBypassRules describes the set of URLs that should bypass the proxy // settings, as a list of rules. A URL is said to match the bypass rules // if it matches any one of these rules. -class NET_API ProxyBypassRules { +class NET_EXPORT ProxyBypassRules { public: // Interface for an individual proxy bypass rule. - class NET_API Rule { + class NET_EXPORT Rule { public: Rule(); virtual ~Rule(); diff --git a/net/proxy/proxy_config.h b/net/proxy/proxy_config.h index fe3a1d17..0c353ce 100644 --- a/net/proxy/proxy_config.h +++ b/net/proxy/proxy_config.h @@ -9,7 +9,7 @@ #include <string> #include "googleurl/src/gurl.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" #include "net/proxy/proxy_bypass_rules.h" #include "net/proxy/proxy_server.h" @@ -32,11 +32,11 @@ class ProxyInfo; // // For more details see: // http://www.chromium.org/developers/design-documents/proxy-settings-fallback -class NET_API ProxyConfig { +class NET_EXPORT ProxyConfig { public: // ProxyRules describes the "manual" proxy settings. // TODO(eroman): Turn this into a class. - struct NET_API ProxyRules { + struct NET_EXPORT ProxyRules { enum Type { TYPE_NO_RULES, TYPE_SINGLE_PROXY, diff --git a/net/proxy/proxy_config_service.h b/net/proxy/proxy_config_service.h index 157745e..6ec3334 100644 --- a/net/proxy/proxy_config_service.h +++ b/net/proxy/proxy_config_service.h @@ -6,14 +6,14 @@ #define NET_PROXY_PROXY_CONFIG_SERVICE_H_ #pragma once -#include "net/base/net_api.h" +#include "net/base/net_export.h" namespace net { class ProxyConfig; // Service for watching when the proxy settings have changed. -class NET_API ProxyConfigService { +class NET_EXPORT ProxyConfigService { public: // Indicates whether proxy configuration is valid, and if not, why. enum ConfigAvailability { @@ -26,7 +26,7 @@ class NET_API ProxyConfigService { }; // Observer for being notified when the proxy settings have changed. - class NET_API Observer { + class NET_EXPORT Observer { public: virtual ~Observer() {} // Notification callback that should be invoked by ProxyConfigService diff --git a/net/proxy/proxy_config_service_fixed.h b/net/proxy/proxy_config_service_fixed.h index 0ad2a51..94c3297 100644 --- a/net/proxy/proxy_config_service_fixed.h +++ b/net/proxy/proxy_config_service_fixed.h @@ -14,7 +14,7 @@ namespace net { // Implementation of ProxyConfigService that returns a fixed result. -class NET_API ProxyConfigServiceFixed : public ProxyConfigService { +class NET_EXPORT ProxyConfigServiceFixed : public ProxyConfigService { public: explicit ProxyConfigServiceFixed(const ProxyConfig& pc); virtual ~ProxyConfigServiceFixed(); diff --git a/net/proxy/proxy_config_service_linux.h b/net/proxy/proxy_config_service_linux.h index 10929ba..2fa81d9 100644 --- a/net/proxy/proxy_config_service_linux.h +++ b/net/proxy/proxy_config_service_linux.h @@ -16,7 +16,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/observer_list.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" #include "net/proxy/proxy_config.h" #include "net/proxy/proxy_config_service.h" #include "net/proxy/proxy_server.h" @@ -25,7 +25,7 @@ namespace net { // Implementation of ProxyConfigService that retrieves the system proxy // settings from environment variables, gconf, gsettings, or kioslaverc (KDE). -class NET_TEST ProxyConfigServiceLinux : public ProxyConfigService { +class NET_EXPORT_PRIVATE ProxyConfigServiceLinux : public ProxyConfigService { public: // Forward declaration of Delegate. diff --git a/net/proxy/proxy_config_service_win.h b/net/proxy/proxy_config_service_win.h index 8ea0330..398e17f 100644 --- a/net/proxy/proxy_config_service_win.h +++ b/net/proxy/proxy_config_service_win.h @@ -40,7 +40,7 @@ namespace net { // implementation details of WinHttpGetIEProxyConfigForCurrentUser() ever // change, or in case we got it wrong (and are not checking all possible // registry dependencies). -class NET_TEST ProxyConfigServiceWin +class NET_EXPORT_PRIVATE ProxyConfigServiceWin : public PollingProxyConfigService, public base::win::ObjectWatcher::Delegate { public: diff --git a/net/proxy/proxy_info.h b/net/proxy/proxy_info.h index ecea5efc..f965e6b 100644 --- a/net/proxy/proxy_info.h +++ b/net/proxy/proxy_info.h @@ -8,7 +8,7 @@ #include <string> -#include "net/base/net_api.h" +#include "net/base/net_export.h" #include "net/proxy/proxy_config.h" #include "net/proxy/proxy_list.h" #include "net/proxy/proxy_retry_info.h" @@ -17,7 +17,7 @@ namespace net { // This object holds proxy information returned by ResolveProxy. -class NET_API ProxyInfo { +class NET_EXPORT ProxyInfo { public: ProxyInfo(); ~ProxyInfo(); diff --git a/net/proxy/proxy_list.h b/net/proxy/proxy_list.h index c03c262..707ceb6 100644 --- a/net/proxy/proxy_list.h +++ b/net/proxy/proxy_list.h @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "net/base/net_api.h" +#include "net/base/net_export.h" #include "net/proxy/proxy_retry_info.h" namespace net { @@ -19,7 +19,7 @@ class ProxyServer; // This class is used to hold a list of proxies returned by GetProxyForUrl or // manually configured. It handles proxy fallback if multiple servers are // specified. -class NET_TEST ProxyList { +class NET_EXPORT_PRIVATE ProxyList { public: ProxyList(); ~ProxyList(); diff --git a/net/proxy/proxy_resolver.h b/net/proxy/proxy_resolver.h index 3e31e9f..0622436 100644 --- a/net/proxy/proxy_resolver.h +++ b/net/proxy/proxy_resolver.h @@ -11,7 +11,7 @@ #include "base/string16.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/proxy/proxy_resolver_script_data.h" namespace net { @@ -23,7 +23,7 @@ class ProxyInfo; // to use for a particular URL. Generally the backend for a ProxyResolver is // a PAC script, but it doesn't need to be. ProxyResolver can service multiple // requests at a time. -class NET_TEST ProxyResolver { +class NET_EXPORT_PRIVATE ProxyResolver { public: // Opaque pointer type, to return a handle to cancel outstanding requests. typedef void* RequestHandle; diff --git a/net/proxy/proxy_resolver_error_observer.h b/net/proxy/proxy_resolver_error_observer.h index d2d183c..fb6bcb2 100644 --- a/net/proxy/proxy_resolver_error_observer.h +++ b/net/proxy/proxy_resolver_error_observer.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/string16.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" namespace net { @@ -16,7 +16,7 @@ namespace net { // default implementation of the ProxyResolverJSBindings takes a class // implementing this interface and forwards all JavaScript errors related to // PAC scripts. -class NET_TEST ProxyResolverErrorObserver { +class NET_EXPORT_PRIVATE ProxyResolverErrorObserver { public: ProxyResolverErrorObserver() {} virtual ~ProxyResolverErrorObserver() {} diff --git a/net/proxy/proxy_resolver_js_bindings.h b/net/proxy/proxy_resolver_js_bindings.h index 8d7e916..a503306 100644 --- a/net/proxy/proxy_resolver_js_bindings.h +++ b/net/proxy/proxy_resolver_js_bindings.h @@ -9,7 +9,7 @@ #include <string> #include "base/string16.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" namespace net { @@ -20,7 +20,7 @@ struct ProxyResolverRequestContext; class SyncHostResolver; // Interface for the javascript bindings. -class NET_TEST ProxyResolverJSBindings { +class NET_EXPORT_PRIVATE ProxyResolverJSBindings { public: ProxyResolverJSBindings() : current_request_context_(NULL) {} diff --git a/net/proxy/proxy_resolver_mac.h b/net/proxy/proxy_resolver_mac.h index f3fd865..cdc37e7 100644 --- a/net/proxy/proxy_resolver_mac.h +++ b/net/proxy/proxy_resolver_mac.h @@ -8,7 +8,7 @@ #include "base/compiler_specific.h" #include "googleurl/src/gurl.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" #include "net/base/net_errors.h" #include "net/proxy/proxy_resolver.h" @@ -16,7 +16,7 @@ namespace net { // Implementation of ProxyResolver that uses the Mac CFProxySupport to implement // proxies. -class NET_API ProxyResolverMac : public ProxyResolver { +class NET_EXPORT ProxyResolverMac : public ProxyResolver { public: ProxyResolverMac(); virtual ~ProxyResolverMac(); diff --git a/net/proxy/proxy_resolver_script_data.h b/net/proxy/proxy_resolver_script_data.h index 46710e4..7631d13 100644 --- a/net/proxy/proxy_resolver_script_data.h +++ b/net/proxy/proxy_resolver_script_data.h @@ -9,7 +9,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" namespace net { @@ -19,7 +19,7 @@ namespace net { // // This is thread-safe so it can be used by multi-threaded implementations of // ProxyResolver to share the data between threads. -class NET_TEST ProxyResolverScriptData +class NET_EXPORT_PRIVATE ProxyResolverScriptData : public base::RefCountedThreadSafe<ProxyResolverScriptData> { public: enum Type { diff --git a/net/proxy/proxy_resolver_v8.h b/net/proxy/proxy_resolver_v8.h index efec6c9..1f64a18 100644 --- a/net/proxy/proxy_resolver_v8.h +++ b/net/proxy/proxy_resolver_v8.h @@ -8,7 +8,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" #include "net/proxy/proxy_resolver.h" namespace net { @@ -33,7 +33,7 @@ class ProxyResolverJSBindings; // This is the case with the V8 instance used by chromium's renderer -- it runs // on a different thread from ProxyResolver (renderer thread vs PAC thread), // and does not use locking since it expects to be alone. -class NET_TEST ProxyResolverV8 : public ProxyResolver { +class NET_EXPORT_PRIVATE ProxyResolverV8 : public ProxyResolver { public: // Constructs a ProxyResolverV8 with custom bindings. ProxyResolverV8 takes // ownership of |custom_js_bindings| and deletes it when ProxyResolverV8 diff --git a/net/proxy/proxy_resolver_winhttp.h b/net/proxy/proxy_resolver_winhttp.h index 8fcce9d..5c39673 100644 --- a/net/proxy/proxy_resolver_winhttp.h +++ b/net/proxy/proxy_resolver_winhttp.h @@ -16,7 +16,7 @@ namespace net { // An implementation of ProxyResolver that uses WinHTTP and the system // proxy settings. -class NET_TEST ProxyResolverWinHttp : public ProxyResolver { +class NET_EXPORT_PRIVATE ProxyResolverWinHttp : public ProxyResolver { public: ProxyResolverWinHttp(); virtual ~ProxyResolverWinHttp(); diff --git a/net/proxy/proxy_script_fetcher.h b/net/proxy/proxy_script_fetcher.h index 778c6b1..875b6e5 100644 --- a/net/proxy/proxy_script_fetcher.h +++ b/net/proxy/proxy_script_fetcher.h @@ -12,7 +12,7 @@ #include "base/string16.h" #include "net/base/completion_callback.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" class GURL; @@ -22,7 +22,7 @@ class URLRequestContext; // Interface for downloading a PAC script. Implementations can enforce // timeouts, maximum size constraints, content encoding, etc.. -class NET_TEST ProxyScriptFetcher { +class NET_EXPORT_PRIVATE ProxyScriptFetcher { public: // Destruction should cancel any outstanding requests. virtual ~ProxyScriptFetcher() {} diff --git a/net/proxy/proxy_script_fetcher_impl.h b/net/proxy/proxy_script_fetcher_impl.h index 8482bd93..ff57a28 100644 --- a/net/proxy/proxy_script_fetcher_impl.h +++ b/net/proxy/proxy_script_fetcher_impl.h @@ -25,8 +25,8 @@ class URLRequestContext; // Implementation of ProxyScriptFetcher that downloads scripts using the // specified request context. -class NET_API ProxyScriptFetcherImpl : public ProxyScriptFetcher, - public URLRequest::Delegate { +class NET_EXPORT ProxyScriptFetcherImpl : public ProxyScriptFetcher, + public URLRequest::Delegate { public: // Creates a ProxyScriptFetcher that issues requests through // |url_request_context|. |url_request_context| must remain valid for the diff --git a/net/proxy/proxy_server.h b/net/proxy/proxy_server.h index cfcd41a..1ec2849 100644 --- a/net/proxy/proxy_server.h +++ b/net/proxy/proxy_server.h @@ -14,13 +14,13 @@ #include <string> #include "net/base/host_port_pair.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" namespace net { // ProxyServer encodes the {type, host, port} of a proxy server. // ProxyServer is immutable. -class NET_API ProxyServer { +class NET_EXPORT ProxyServer { public: // The type of proxy. These are defined as bit flags so they can be ORed // together to pass as the |scheme_bit_field| argument to diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h index 3303480..ad73b39 100644 --- a/net/proxy/proxy_service.h +++ b/net/proxy/proxy_service.h @@ -14,7 +14,7 @@ #include "base/synchronization/waitable_event.h" #include "base/threading/non_thread_safe.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/base/network_change_notifier.h" #include "net/proxy/proxy_config_service.h" @@ -37,9 +37,9 @@ class URLRequestContext; // This class can be used to resolve the proxy server to use when loading a // HTTP(S) URL. It uses the given ProxyResolver to handle the actual proxy // resolution. See ProxyResolverV8 for example. -class NET_API ProxyService : public NetworkChangeNotifier::IPAddressObserver, - public ProxyConfigService::Observer, - NON_EXPORTED_BASE(public base::NonThreadSafe) { +class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver, + public ProxyConfigService::Observer, + NON_EXPORTED_BASE(public base::NonThreadSafe) { public: // The instance takes ownership of |config_service| and |resolver|. // |net_log| is a possibly NULL destination to send log events to. It must @@ -362,7 +362,7 @@ class NET_API ProxyService : public NetworkChangeNotifier::IPAddressObserver, }; // Wrapper for invoking methods on a ProxyService synchronously. -class NET_API SyncProxyServiceHelper +class NET_EXPORT SyncProxyServiceHelper : public base::RefCountedThreadSafe<SyncProxyServiceHelper> { public: SyncProxyServiceHelper(MessageLoop* io_message_loop, diff --git a/net/proxy/sync_host_resolver.h b/net/proxy/sync_host_resolver.h index 44ee707..6dfca8f 100644 --- a/net/proxy/sync_host_resolver.h +++ b/net/proxy/sync_host_resolver.h @@ -7,13 +7,13 @@ #pragma once #include "net/base/host_resolver.h" -#include "net/base/net_api.h" +#include "net/base/net_export.h" namespace net { // Interface used by ProxyResolverJSBindings to abstract a synchronous host // resolver module (which includes a Shutdown method). -class NET_TEST SyncHostResolver { +class NET_EXPORT_PRIVATE SyncHostResolver { public: virtual ~SyncHostResolver() {} diff --git a/net/proxy/sync_host_resolver_bridge.h b/net/proxy/sync_host_resolver_bridge.h index 92f0a4c..9f35c11 100644 --- a/net/proxy/sync_host_resolver_bridge.h +++ b/net/proxy/sync_host_resolver_bridge.h @@ -15,7 +15,7 @@ namespace net { // Wrapper around HostResolver to give a sync API while running the resolver // in async mode on |host_resolver_loop|. -class NET_TEST SyncHostResolverBridge : public SyncHostResolver { +class NET_EXPORT_PRIVATE SyncHostResolverBridge : public SyncHostResolver { public: SyncHostResolverBridge(HostResolver* host_resolver, MessageLoop* host_resolver_loop); |