net: Add NET_API to a few more files.

BUG=76997
TEST=NONE
Review URL: http://codereview.chromium.org/7056019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86181 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 12 insertions, 8 deletions

diff --git a/net/proxy/dhcp_proxy_script_adapter_fetcher_win.h b/net/proxy/dhcp_proxy_script_adapter_fetcher_win.h
index bab7468..166c7a7 100644
--- a/net/proxy/dhcp_proxy_script_adapter_fetcher_win.h
+++ b/net/proxy/dhcp_proxy_script_adapter_fetcher_win.h
@@ -13,6 +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 "googleurl/src/gurl.h"
 
 namespace base {
@@ -26,9 +27,9 @@ 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 DhcpProxyScriptAdapterFetcher
+class NET_TEST DhcpProxyScriptAdapterFetcher
     : public base::SupportsWeakPtr<DhcpProxyScriptAdapterFetcher>,
-      public base::NonThreadSafe {
+      NON_EXPORTED_BASE(public base::NonThreadSafe) {
  public:
   // |url_request_context| must outlive DhcpProxyScriptAdapterFetcher.
   explicit DhcpProxyScriptAdapterFetcher(
@@ -81,7 +82,8 @@ class DhcpProxyScriptAdapterFetcher
   // only a weak reference back to the main object, so that the main object
   // can be destroyed before the thread ends.  This also keeps the main
   // object completely thread safe and allows it to be non-refcounted.
-  class WorkerThread : public base::RefCountedThreadSafe<WorkerThread> {
+  class NET_TEST WorkerThread
+      : public base::RefCountedThreadSafe<WorkerThread> {
    public:
     // Creates and initializes (but does not start) the worker thread.
     explicit WorkerThread(
diff --git a/net/proxy/dhcp_proxy_script_fetcher.h b/net/proxy/dhcp_proxy_script_fetcher.h
index adb011d..2d07303 100644
--- a/net/proxy/dhcp_proxy_script_fetcher.h
+++ b/net/proxy/dhcp_proxy_script_fetcher.h
@@ -10,6 +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/proxy/proxy_script_fetcher.h"
 #include "net/url_request/url_request_context.h"
 
@@ -23,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 DhcpProxyScriptFetcher {
+class NET_TEST DhcpProxyScriptFetcher {
  public:
   // Destruction should cancel any outstanding requests.
   virtual ~DhcpProxyScriptFetcher();
@@ -79,7 +80,7 @@ class DhcpProxyScriptFetcher {
 
 // A do-nothing retriever, always returns synchronously with
 // ERR_NOT_IMPLEMENTED result and empty text.
-class DoNothingDhcpProxyScriptFetcher : public DhcpProxyScriptFetcher {
+class NET_TEST 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 20e4104..4bb2446 100644
--- a/net/proxy/dhcp_proxy_script_fetcher_factory.h
+++ b/net/proxy/dhcp_proxy_script_fetcher_factory.h
@@ -9,6 +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/url_request/url_request_context.h"
 
 namespace net {
@@ -29,7 +30,7 @@ class DhcpProxyScriptFetcher;
 //
 // Therefore, we have platform-specific implementations, and so we use
 // this factory to select the right one.
-class DhcpProxyScriptFetcherFactory {
+class NET_API 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 3783971..dc68bc4 100644
--- a/net/proxy/dhcp_proxy_script_fetcher_win.h
+++ b/net/proxy/dhcp_proxy_script_fetcher_win.h
@@ -21,9 +21,9 @@ class DhcpProxyScriptAdapterFetcher;
 class URLRequestContext;
 
 // Windows-specific implementation.
-class DhcpProxyScriptFetcherWin
+class NET_TEST DhcpProxyScriptFetcherWin
     : public DhcpProxyScriptFetcher,
-      public base::NonThreadSafe {
+      NON_EXPORTED_BASE(public base::NonThreadSafe) {
  public:
   // Creates a DhcpProxyScriptFetcherWin that issues requests through
   // |url_request_context|. |url_request_context| must remain valid for