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

234 files changed, 788 insertions, 749 deletions

diff --git a/net/base/address_list.h b/net/base/address_list.h
index 62acd4a..af16f5a 100644
--- a/net/base/address_list.h
+++ b/net/base/address_list.h
@@ -9,7 +9,7 @@
 #include <string>
 
 #include "base/memory/ref_counted.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/base/net_util.h"
 
 struct addrinfo;
@@ -18,7 +18,7 @@ namespace net {
 
 // An AddressList object contains a linked list of addrinfo structures.  This
 // class is designed to be copied around by value.
-class NET_API AddressList {
+class NET_EXPORT AddressList {
  public:
   // Constructs an invalid address list. Should not call any methods on this
   // other than assignment.
diff --git a/net/base/asn1_util.h b/net/base/asn1_util.h
index dc9982b..cae0b00 100644
--- a/net/base/asn1_util.h
+++ b/net/base/asn1_util.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/string_piece.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
@@ -60,8 +60,8 @@ bool GetElement(base::StringPiece* in,
 // ExtractSPKIFromDERCert parses the DER encoded certificate in |cert| and
 // extracts the bytes of the SubjectPublicKeyInfo. On successful return,
 // |spki_out| is set to contain the SPKI, pointing into |cert|.
-NET_TEST bool ExtractSPKIFromDERCert(base::StringPiece cert,
-                                     base::StringPiece* spki_out);
+NET_EXPORT_PRIVATE bool ExtractSPKIFromDERCert(base::StringPiece cert,
+                                               base::StringPiece* spki_out);
 
 // ExtractCRLURLsFromDERCert parses the DER encoded certificate in |cert| and
 // extracts the URL of each CRL. On successful return, the elements of
@@ -75,7 +75,7 @@ NET_TEST bool ExtractSPKIFromDERCert(base::StringPiece cert,
 // The nested set of GeneralNames is flattened into a single list because
 // having several CRLs with one location is equivalent to having one CRL with
 // several locations as far as a CRL filter is concerned.
-NET_TEST bool ExtractCRLURLsFromDERCert(
+NET_EXPORT_PRIVATE bool ExtractCRLURLsFromDERCert(
     base::StringPiece cert,
     std::vector<base::StringPiece>* urls_out);
 
diff --git a/net/base/auth.h b/net/base/auth.h
index 93ef13e..834d9b5 100644
--- a/net/base/auth.h
+++ b/net/base/auth.h
@@ -10,13 +10,13 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/string16.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
 // Holds info about an authentication challenge that we may want to display
 // to the user.
-class NET_API AuthChallengeInfo :
+class NET_EXPORT AuthChallengeInfo :
     public base::RefCountedThreadSafe<AuthChallengeInfo> {
  public:
   AuthChallengeInfo();
diff --git a/net/base/backoff_entry.h b/net/base/backoff_entry.h
index a3bca91..e964670 100644
--- a/net/base/backoff_entry.h
+++ b/net/base/backoff_entry.h
@@ -8,7 +8,7 @@
 
 #include "base/threading/non_thread_safe.h"
 #include "base/time.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
@@ -17,7 +17,8 @@ namespace net {
 //
 // This utility class knows nothing about network specifics; it is
 // intended for reuse in various networking scenarios.
-class NET_TEST BackoffEntry : NON_EXPORTED_BASE(public base::NonThreadSafe) {
+class NET_EXPORT_PRIVATE BackoffEntry
+    : NON_EXPORTED_BASE(public base::NonThreadSafe) {
  public:
   // The set of parameters that define a back-off policy.
   struct Policy {
diff --git a/net/base/capturing_net_log.h b/net/base/capturing_net_log.h
index f60f6ed..f7a5461 100644
--- a/net/base/capturing_net_log.h
+++ b/net/base/capturing_net_log.h
@@ -15,16 +15,16 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/time.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/base/net_log.h"
 
 namespace net {
 
 // CapturingNetLog is an implementation of NetLog that saves messages to a
 // bounded buffer.
-class NET_API CapturingNetLog : public NetLog {
+class NET_EXPORT CapturingNetLog : public NetLog {
  public:
-  struct NET_API Entry {
+  struct NET_EXPORT Entry {
     Entry(EventType type,
           const base::TimeTicks& time,
           Source source,
@@ -87,7 +87,7 @@ class NET_API CapturingNetLog : public NetLog {
 //
 // CapturingBoundNetLog can easily be converted to a BoundNetLog using the
 // bound() method.
-class NET_TEST CapturingBoundNetLog {
+class NET_EXPORT_PRIVATE CapturingBoundNetLog {
  public:
   CapturingBoundNetLog(const NetLog::Source& source, CapturingNetLog* net_log);
 
diff --git a/net/base/cert_database.h b/net/base/cert_database.h
index 94f49a0..0c94c93 100644
--- a/net/base/cert_database.h
+++ b/net/base/cert_database.h
@@ -13,7 +13,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/string16.h"
 #include "net/base/cert_type.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
@@ -30,7 +30,7 @@ typedef std::vector<scoped_refptr<X509Certificate> > CertificateList;
 // for all operations that manipulate the underlying system
 // certificate store.
 
-class NET_API CertDatabase {
+class NET_EXPORT CertDatabase {
  public:
 
   // A CertDatabase::Observer will be notified on certificate database changes.
@@ -38,7 +38,7 @@ class NET_API CertDatabase {
   // a certificate is changed.  Observers can register themselves
   // via CertDatabase::AddObserver, and can un-register with
   // CertDatabase::RemoveObserver.
-  class NET_API Observer {
+  class NET_EXPORT Observer {
    public:
     virtual ~Observer() {}
 
@@ -58,7 +58,7 @@ class NET_API CertDatabase {
   };
 
   // Stores per-certificate error codes for import failures.
-  struct NET_API ImportCertFailure {
+  struct NET_EXPORT ImportCertFailure {
    public:
     ImportCertFailure(X509Certificate* cert, int err);
     ~ImportCertFailure();
diff --git a/net/base/cert_verifier.h b/net/base/cert_verifier.h
index 145fb59..9a05510 100644
--- a/net/base/cert_verifier.h
+++ b/net/base/cert_verifier.h
@@ -16,7 +16,7 @@
 #include "net/base/cert_database.h"
 #include "net/base/cert_verify_result.h"
 #include "net/base/completion_callback.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/base/x509_cert_types.h"
 
 namespace net {
@@ -48,8 +48,8 @@ struct CachedCertVerifyResult {
 // request at a time is to create a SingleRequestCertVerifier wrapper around
 // CertVerifier (which will automatically cancel the single request when it
 // goes out of scope).
-class NET_API CertVerifier : NON_EXPORTED_BASE(public base::NonThreadSafe),
-                             public CertDatabase::Observer {
+class NET_EXPORT CertVerifier : NON_EXPORTED_BASE(public base::NonThreadSafe),
+                                public CertDatabase::Observer {
  public:
   // Opaque type used to cancel a request.
   typedef void* RequestHandle;
diff --git a/net/base/cert_verify_result.h b/net/base/cert_verify_result.h
index 2e4c250..aa65500 100644
--- a/net/base/cert_verify_result.h
+++ b/net/base/cert_verify_result.h
@@ -8,7 +8,7 @@
 
 #include <vector>
 
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "base/memory/ref_counted.h"
 #include "net/base/x509_cert_types.h"
 
@@ -17,7 +17,7 @@ namespace net {
 class X509Certificate;
 
 // The result of certificate verification.
-class NET_API CertVerifyResult {
+class NET_EXPORT CertVerifyResult {
  public:
   CertVerifyResult();
   ~CertVerifyResult();
diff --git a/net/base/cookie_monster.h b/net/base/cookie_monster.h
index d6161ce..2c4318c 100644
--- a/net/base/cookie_monster.h
+++ b/net/base/cookie_monster.h
@@ -21,7 +21,7 @@
 #include "base/task.h"
 #include "base/time.h"
 #include "net/base/cookie_store.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 class GURL;
 
@@ -50,7 +50,7 @@ class CookieList;
 //
 // TODO(deanm) Implement CookieMonster, the cookie database.
 //  - Verify that our domain enforcement and non-dotted handling is correct
-class NET_API CookieMonster : public CookieStore {
+class NET_EXPORT CookieMonster : public CookieStore {
  public:
   class CanonicalCookie;
   class Delegate;
@@ -586,7 +586,7 @@ class NET_API CookieMonster : public CookieStore {
   DISALLOW_COPY_AND_ASSIGN(CookieMonster);
 };
 
-class NET_API CookieMonster::CanonicalCookie {
+class NET_EXPORT CookieMonster::CanonicalCookie {
  public:
 
   // These constructors do no validation or canonicalization of their inputs;
@@ -746,7 +746,7 @@ class CookieMonster::Delegate
   virtual ~Delegate() {}
 };
 
-class NET_API CookieMonster::ParsedCookie {
+class NET_EXPORT CookieMonster::ParsedCookie {
  public:
   typedef std::pair<std::string, std::string> TokenValuePair;
   typedef std::vector<TokenValuePair> PairList;
diff --git a/net/base/cookie_store.h b/net/base/cookie_store.h
index 2538051..d0ede14 100644
--- a/net/base/cookie_store.h
+++ b/net/base/cookie_store.h
@@ -16,7 +16,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/time.h"
 #include "net/base/cookie_options.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 class GURL;
 
@@ -26,12 +26,12 @@ class CookieMonster;
 
 // An interface for storing and retrieving cookies. Implementations need to
 // be thread safe as its methods can be accessed from IO as well as UI threads.
-class NET_API CookieStore : public base::RefCountedThreadSafe<CookieStore> {
+class NET_EXPORT CookieStore : public base::RefCountedThreadSafe<CookieStore> {
  public:
   // This struct contains additional consumer-specific information that might
   // be stored with cookies; currently just MAC information, see:
   // http://tools.ietf.org/html/draft-ietf-oauth-v2-http-mac
-  struct NET_API CookieInfo {
+  struct NET_EXPORT CookieInfo {
     CookieInfo();
     ~CookieInfo();
 
diff --git a/net/base/crl_filter.h b/net/base/crl_filter.h
index 787d82a..0ba4abb 100644
--- a/net/base/crl_filter.h
+++ b/net/base/crl_filter.h
@@ -15,7 +15,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/string_piece.h"
 #include "base/synchronization/lock.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
@@ -29,7 +29,7 @@ class GolombCompressedSet;
 // a firm "not revoked" answer or a probabilistic "revoked" answer.
 // Additionally, a CRLFilter can contain a list of blocked public keys and, in
 // that case, it can give a firm "revoked" answer.
-class NET_TEST CRLFilter : public base::RefCounted<CRLFilter> {
+class NET_EXPORT_PRIVATE CRLFilter : public base::RefCounted<CRLFilter> {
  public:
   enum Result {
     REVOKED,  // the certificate should be rejected.
diff --git a/net/base/crypto_module.h b/net/base/crypto_module.h
index 7e38ed1..2b37e86 100644
--- a/net/base/crypto_module.h
+++ b/net/base/crypto_module.h
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "base/memory/ref_counted.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 #if defined(USE_NSS)
 typedef struct PK11SlotInfoStr PK11SlotInfo;
@@ -22,7 +22,8 @@ class CryptoModule;
 
 typedef std::vector<scoped_refptr<CryptoModule> > CryptoModuleList;
 
-class NET_API CryptoModule : public base::RefCountedThreadSafe<CryptoModule> {
+class NET_EXPORT CryptoModule
+    : public base::RefCountedThreadSafe<CryptoModule> {
  public:
 #if defined(USE_NSS)
   typedef PK11SlotInfo* OSModuleHandle;
diff --git a/net/base/data_url.h b/net/base/data_url.h
index a6c42ea..7b48574 100644
--- a/net/base/data_url.h
+++ b/net/base/data_url.h
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 class GURL;
 
@@ -28,7 +28,7 @@ namespace net {
 // If <mediatype> is omitted, it defaults to text/plain;charset=US-ASCII.  As a
 // shorthand, "text/plain" can be omitted but the charset parameter supplied.
 //
-class NET_API DataURL {
+class NET_EXPORT DataURL {
  public:
   // This method can be used to parse a 'data' URL into its component pieces.
   //
diff --git a/net/base/default_origin_bound_cert_store.h b/net/base/default_origin_bound_cert_store.h
index b58ba2f..0088577 100644
--- a/net/base/default_origin_bound_cert_store.h
+++ b/net/base/default_origin_bound_cert_store.h
@@ -13,7 +13,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/base/origin_bound_cert_store.h"
 
 class Task;
@@ -28,7 +28,7 @@ namespace net {
 //
 // This class can be accessed by multiple threads. For example, it can be used
 // by IO and origin bound cert management UI.
-class NET_API DefaultOriginBoundCertStore : public OriginBoundCertStore {
+class NET_EXPORT DefaultOriginBoundCertStore : public OriginBoundCertStore {
  public:
   class OriginBoundCert;
   class PersistentStore;
@@ -110,7 +110,7 @@ class NET_API DefaultOriginBoundCertStore : public OriginBoundCertStore {
 
 // The OriginBoundCert class contains a private key in addition to the origin
 // and the cert.
-class NET_API DefaultOriginBoundCertStore::OriginBoundCert {
+class NET_EXPORT DefaultOriginBoundCertStore::OriginBoundCert {
  public:
   OriginBoundCert();
   OriginBoundCert(const std::string& origin,
@@ -130,7 +130,7 @@ class NET_API DefaultOriginBoundCertStore::OriginBoundCert {
 typedef base::RefCountedThreadSafe<DefaultOriginBoundCertStore::PersistentStore>
     RefcountedPersistentStore;
 
-class NET_API DefaultOriginBoundCertStore::PersistentStore
+class NET_EXPORT DefaultOriginBoundCertStore::PersistentStore
     : public RefcountedPersistentStore {
  public:
   virtual ~PersistentStore() {}
diff --git a/net/base/directory_lister.h b/net/base/directory_lister.h
index 7cf2c34..6155e85 100644
--- a/net/base/directory_lister.h
+++ b/net/base/directory_lister.h
@@ -12,7 +12,7 @@
 #include "base/file_util.h"
 #include "base/message_loop_proxy.h"
 #include "base/memory/ref_counted.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
@@ -23,7 +23,7 @@ namespace net {
 // structs over to the main application thread.  The consumer of this class
 // is insulated from any of the multi-threading details.
 //
-class NET_API DirectoryLister  {
+class NET_EXPORT DirectoryLister  {
  public:
   // Represents one file found.
   struct DirectoryListerData {
diff --git a/net/base/dns_util.h b/net/base/dns_util.h
index 939a4a7..f09e906 100644
--- a/net/base/dns_util.h
+++ b/net/base/dns_util.h
@@ -10,7 +10,7 @@
 
 #include "base/basictypes.h"
 #include "base/string_piece.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
@@ -19,17 +19,18 @@ namespace net {
 //
 //   dotted: a string in dotted form: "www.google.com"
 //   out: a result in DNS form: "\x03www\x06google\x03com\x00"
-NET_TEST bool DNSDomainFromDot(const std::string& dotted, std::string* out);
+NET_EXPORT_PRIVATE bool DNSDomainFromDot(const std::string& dotted,
+                                         std::string* out);
 
 // DNSDomainToString coverts a domain in DNS format to a dotted string.
-NET_TEST std::string DNSDomainToString(const std::string& domain);
+NET_EXPORT_PRIVATE std::string DNSDomainToString(const std::string& domain);
 
 // Returns true iff the given character is in the set of valid DNS label
 // characters as given in RFC 3490, 4.1, 3(a)
-NET_TEST bool IsSTD3ASCIIValidCharacter(char c);
+NET_EXPORT_PRIVATE bool IsSTD3ASCIIValidCharacter(char c);
 
 // Returns the hostname by trimming the ending dot, if one exists.
-NET_API std::string TrimEndingDot(const std::string& host);
+NET_EXPORT std::string TrimEndingDot(const std::string& host);
 
 // DNS class types.
 static const uint16 kClassIN = 1;
diff --git a/net/base/dnsrr_resolver.h b/net/base/dnsrr_resolver.h
index aca6a2e..06d7c8c 100644
--- a/net/base/dnsrr_resolver.h
+++ b/net/base/dnsrr_resolver.h
@@ -17,13 +17,13 @@
 #include "base/time.h"
 #include "build/build_config.h"
 #include "net/base/completion_callback.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/base/network_change_notifier.h"
 
 namespace net {
 
 // RRResponse contains the result of a successful request for a resource record.
-struct NET_TEST RRResponse {
+struct NET_EXPORT_PRIVATE RRResponse {
   RRResponse();
   ~RRResponse();
 
@@ -67,8 +67,9 @@ class RRResolverJob;
 // the name is a fully qualified DNS domain.
 //
 // A DnsRRResolver must be used from the MessageLoop which created it.
-class NET_API DnsRRResolver : NON_EXPORTED_BASE(public base::NonThreadSafe),
-                              public NetworkChangeNotifier::IPAddressObserver {
+class NET_EXPORT DnsRRResolver
+    : NON_EXPORTED_BASE(public base::NonThreadSafe),
+      public NetworkChangeNotifier::IPAddressObserver {
  public:
   typedef intptr_t Handle;
 
diff --git a/net/base/dnssec_chain_verifier.h b/net/base/dnssec_chain_verifier.h
index 630be5f..9fa80b8 100644
--- a/net/base/dnssec_chain_verifier.h
+++ b/net/base/dnssec_chain_verifier.h
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "base/string_piece.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
@@ -19,7 +19,7 @@ namespace net {
 // name. For example, if the fingerprint of a certificate was stored in a CERT
 // record for a given domain, then a chain could prove the validity of that
 // fingerprint.
-class NET_TEST DNSSECChainVerifier {
+class NET_EXPORT_PRIVATE DNSSECChainVerifier {
  public:
   enum Error {
     OK = 0,
@@ -103,7 +103,7 @@ class NET_TEST DNSSECChainVerifier {
 // Authority Authorization records. These are DNS records which can express
 // limitations regarding acceptable certificates for a domain. See
 // http://tools.ietf.org/html/draft-hallambaker-donotissue-04
-class NET_TEST DnsCAARecord {
+class NET_EXPORT_PRIVATE DnsCAARecord {
  public:
   enum ParseResult {
     SUCCESS,  // parse successful.
@@ -115,7 +115,7 @@ class NET_TEST DnsCAARecord {
   // A CAAPolicy is the result of parsing a set of CAA records. It describes a
   // number of properies of certificates in a chain, any of which is sufficient
   // to validate the chain.
-  struct NET_TEST Policy {
+  struct NET_EXPORT_PRIVATE Policy {
    public:
     Policy();
     ~Policy();
diff --git a/net/base/dnssec_keyset.h b/net/base/dnssec_keyset.h
index 448ee3d..0db4d96 100644
--- a/net/base/dnssec_keyset.h
+++ b/net/base/dnssec_keyset.h
@@ -9,13 +9,13 @@
 #include <vector>
 
 #include "base/string_piece.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
 // DNSSECKeySet function wraps crypto/signature_verifier.h to accept
 // DNSSEC encodings. (See RFC 4043)
-class NET_TEST DNSSECKeySet {
+class NET_EXPORT_PRIVATE DNSSECKeySet {
  public:
   DNSSECKeySet();
   ~DNSSECKeySet();
diff --git a/net/base/escape.h b/net/base/escape.h
index ee8fd05..91e87b2 100644
--- a/net/base/escape.h
+++ b/net/base/escape.h
@@ -11,37 +11,37 @@
 
 #include "base/basictypes.h"
 #include "base/string16.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 // Escaping --------------------------------------------------------------------
 
 // Escape a file.  This includes:
 // non-printable, non-7bit, and (including space)  "#%:<>?[\]^`{|}
-NET_API std::string EscapePath(const std::string& path);
+NET_EXPORT std::string EscapePath(const std::string& path);
 
 // Escape application/x-www-form-urlencoded content.  This includes:
 // non-printable, non-7bit, and (including space)  ?>=<;+'&%$#"![\]^`{|}
 // Space is escaped as + (if use_plus is true) and other special characters
 // as %XX (hex).
-NET_API std::string EscapeUrlEncodedData(const std::string& path,
-                                         bool use_plus);
+NET_EXPORT std::string EscapeUrlEncodedData(const std::string& path,
+                                            bool use_plus);
 
 // Escape all non-ASCII input.
-NET_API std::string EscapeNonASCII(const std::string& input);
+NET_EXPORT std::string EscapeNonASCII(const std::string& input);
 
 // Escapes characters in text suitable for use as an external protocol handler
 // command.
 // We %XX everything except alphanumerics and %-_.!~*'() and the restricted
 // chracters (;/?:@&=+$,).
-NET_API std::string EscapeExternalHandlerValue(const std::string& text);
+NET_EXPORT std::string EscapeExternalHandlerValue(const std::string& text);
 
 // Append the given character to the output string, escaping the character if
 // the character would be interpretted as an HTML delimiter.
-NET_API void AppendEscapedCharForHTML(char c, std::string* output);
+NET_EXPORT void AppendEscapedCharForHTML(char c, std::string* output);
 
 // Escape chars that might cause this text to be interpretted as HTML tags.
-NET_API std::string EscapeForHTML(const std::string& text);
-NET_API string16 EscapeForHTML(const string16& text);
+NET_EXPORT std::string EscapeForHTML(const std::string& text);
+NET_EXPORT string16 EscapeForHTML(const string16& text);
 
 // Unescaping ------------------------------------------------------------------
 
@@ -95,10 +95,10 @@ class UnescapeRule {
 // which, after unescaping, is supposed to be interpreted as UTF-8, and then
 // converted into full UTF-16 chars. This function won't tell you if any
 // conversions need to take place, it only unescapes.
-NET_API std::string UnescapeURLComponent(const std::string& escaped_text,
+NET_EXPORT std::string UnescapeURLComponent(const std::string& escaped_text,
+                                            UnescapeRule::Type rules);
+NET_EXPORT string16 UnescapeURLComponent(const string16& escaped_text,
                                          UnescapeRule::Type rules);
-NET_API string16 UnescapeURLComponent(const string16& escaped_text,
-                                      UnescapeRule::Type rules);
 
 // Unescapes the given substring as a URL, and then tries to interpret the
 // result as being encoded as UTF-8. If the result is convertable into UTF-8, it
@@ -109,18 +109,18 @@ NET_API string16 UnescapeURLComponent(const string16& escaped_text,
 // decoding.  If this isn't possible because an offset points past the end of
 // the source strings or into the middle of a multibyte sequence, the offending
 // offset will be set to string16::npos. |offset[s]_for_adjustment| may be NULL.
-NET_API string16 UnescapeAndDecodeUTF8URLComponent(
+NET_EXPORT string16 UnescapeAndDecodeUTF8URLComponent(
     const std::string& text,
     UnescapeRule::Type rules,
     size_t* offset_for_adjustment);
-NET_API string16 UnescapeAndDecodeUTF8URLComponentWithOffsets(
+NET_EXPORT string16 UnescapeAndDecodeUTF8URLComponentWithOffsets(
     const std::string& text,
     UnescapeRule::Type rules,
     std::vector<size_t>* offsets_for_adjustment);
 
 // Unescape the following ampersand character codes from |text|:
 // &lt; &gt; &amp; &quot; &#39;
-NET_API string16 UnescapeForHTML(const string16& text);
+NET_EXPORT string16 UnescapeForHTML(const string16& text);
 
 // Deprecated ------------------------------------------------------------------
 
@@ -130,20 +130,23 @@ NET_API string16 UnescapeForHTML(const string16& text);
 // This is basically the same as encodeURIComponent in javascript.
 // For the string16 version, we do a conversion to charset before encoding the
 // string.  If the charset doesn't exist, we return false.
-NET_API std::string EscapeQueryParamValue(const std::string& text,
-                                          bool use_plus);
-NET_API bool EscapeQueryParamValue(const string16& text, const char* codepage,
-                                   bool use_plus, string16* escaped);
+NET_EXPORT std::string EscapeQueryParamValue(const std::string& text,
+                                             bool use_plus);
+NET_EXPORT bool EscapeQueryParamValue(const string16& text,
+                                      const char* codepage,
+                                      bool use_plus,
+                                      string16* escaped);
 
 // A specialized version of EscapeQueryParamValue for string16s that
 // assumes the codepage is UTF8.  This is provided as a convenience.
-NET_API string16 EscapeQueryParamValueUTF8(const string16& text, bool use_plus);
+NET_EXPORT string16 EscapeQueryParamValueUTF8(const string16& text,
+                                              bool use_plus);
 
 // Private Functions (Exposed for Unit Testing) --------------------------------
 
 // A function called by std::for_each that will adjust any offset which occurs
 // after one or more encoded characters.
-struct NET_TEST AdjustEncodingOffset {
+struct NET_EXPORT_PRIVATE AdjustEncodingOffset {
   typedef std::vector<size_t> Adjustments;
 
   explicit AdjustEncodingOffset(const Adjustments& adjustments);
diff --git a/net/base/file_stream.h b/net/base/file_stream.h
index 5e07adc..da42afb 100644
--- a/net/base/file_stream.h
+++ b/net/base/file_stream.h
@@ -14,7 +14,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/platform_file.h"
 #include "net/base/completion_callback.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 class FilePath;
 
@@ -28,7 +28,7 @@ enum Whence {
   FROM_END     = 2
 };
 
-class NET_API FileStream {
+class NET_EXPORT FileStream {
  public:
   FileStream();
 
diff --git a/net/base/filter.h b/net/base/filter.h
index 99d8356..1cea2d2 100644
--- a/net/base/filter.h
+++ b/net/base/filter.h
@@ -38,7 +38,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 class GURL;
 
@@ -53,7 +53,7 @@ class IOBuffer;
 // is passed to the constructor of all those filters.  To be clear, the context
 // does NOT reflect the position in a chain, or the fact that there are prior
 // or later filters in a chain.
-class NET_TEST FilterContext {
+class NET_EXPORT_PRIVATE FilterContext {
  public:
   // Enum to control what histograms are emitted near end-of-life of this
   // instance.
@@ -101,7 +101,7 @@ class NET_TEST FilterContext {
 };
 
 //------------------------------------------------------------------------------
-class NET_TEST Filter {
+class NET_EXPORT_PRIVATE Filter {
  public:
   // Return values of function ReadFilteredData.
   enum FilterStatus {
diff --git a/net/base/host_cache.h b/net/base/host_cache.h
index 1b0c3f5..62c07ab 100644
--- a/net/base/host_cache.h
+++ b/net/base/host_cache.h
@@ -15,12 +15,12 @@
 #include "base/time.h"
 #include "net/base/address_family.h"
 #include "net/base/address_list.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
 // Cache used by HostResolver to map hostnames to their resolved result.
-class NET_API HostCache : NON_EXPORTED_BASE(public base::NonThreadSafe) {
+class NET_EXPORT HostCache : NON_EXPORTED_BASE(public base::NonThreadSafe) {
  public:
   // Stores the latest address list that was looked up for a hostname.
   struct Entry : public base::RefCounted<Entry> {
diff --git a/net/base/host_mapping_rules.h b/net/base/host_mapping_rules.h
index f43e6dcb..386e3de 100644
--- a/net/base/host_mapping_rules.h
+++ b/net/base/host_mapping_rules.h
@@ -9,13 +9,13 @@
 #include <string>
 #include <vector>
 #include "base/basictypes.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
 class HostPortPair;
 
-class NET_TEST HostMappingRules {
+class NET_EXPORT_PRIVATE HostMappingRules {
  public:
   HostMappingRules();
   ~HostMappingRules();
diff --git a/net/base/host_port_pair.h b/net/base/host_port_pair.h
index d23b63c..7f009a9 100644
--- a/net/base/host_port_pair.h
+++ b/net/base/host_port_pair.h
@@ -8,14 +8,14 @@
 
 #include <string>
 #include "base/basictypes.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 struct addrinfo;
 class GURL;
 
 namespace net {
 
-class NET_API HostPortPair {
+class NET_EXPORT HostPortPair {
  public:
   HostPortPair();
   // If |in_host| represents an IPv6 address, it should not bracket the address.
diff --git a/net/base/host_resolver.h b/net/base/host_resolver.h
index d2b6a35..6831c8d 100644
--- a/net/base/host_resolver.h
+++ b/net/base/host_resolver.h
@@ -13,7 +13,7 @@
 #include "net/base/address_family.h"
 #include "net/base/completion_callback.h"
 #include "net/base/host_port_pair.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/base/net_util.h"
 #include "net/base/request_priority.h"
 
@@ -34,11 +34,11 @@ class NetLog;
 // request at a time is to create a SingleRequestHostResolver wrapper around
 // HostResolver (which will automatically cancel the single request when it
 // goes out of scope).
-class NET_API HostResolver {
+class NET_EXPORT HostResolver {
  public:
   // The parameters for doing a Resolve(). A hostname and port are required,
   // the rest are optional (and have reasonable defaults).
-  class NET_API RequestInfo {
+  class NET_EXPORT RequestInfo {
    public:
     explicit RequestInfo(const HostPortPair& host_port_pair);
 
@@ -209,15 +209,16 @@ class NET_API HostResolver {
 // |max_retry_attempts| is the maximum number of times we will retry for host
 // resolution. Pass HostResolver::kDefaultRetryAttempts to choose a default
 // value.
-NET_API HostResolver* CreateSystemHostResolver(size_t max_concurrent_resolves,
-                                               size_t max_retry_attempts,
-                                               NetLog* net_log);
+NET_EXPORT HostResolver* CreateSystemHostResolver(
+    size_t max_concurrent_resolves,
+    size_t max_retry_attempts,
+    NetLog* net_log);
 
 // Creates a HostResolver implementation that sends actual DNS queries to
 // the specified DNS server and parses response and returns results.
-NET_API HostResolver* CreateAsyncHostResolver(size_t max_concurrent_resolves,
-                                              const IPAddressNumber& dns_ip,
-                                              NetLog* net_log);
+NET_EXPORT HostResolver* CreateAsyncHostResolver(size_t max_concurrent_resolves,
+                                                 const IPAddressNumber& dns_ip,
+                                                 NetLog* net_log);
 }  // namespace net
 
 #endif  // NET_BASE_HOST_RESOLVER_H_
diff --git a/net/base/host_resolver_impl.h b/net/base/host_resolver_impl.h
index 4fe298d..30772df 100644
--- a/net/base/host_resolver_impl.h
+++ b/net/base/host_resolver_impl.h
@@ -17,7 +17,7 @@
 #include "net/base/host_cache.h"
 #include "net/base/host_resolver.h"
 #include "net/base/host_resolver_proc.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"
 
@@ -59,7 +59,7 @@ namespace net {
 // the results from the first attempt that finishes and ignore the results from
 // all other attempts.
 
-class NET_API HostResolverImpl
+class NET_EXPORT HostResolverImpl
     : public HostResolver,
       NON_EXPORTED_BASE(public base::NonThreadSafe),
       public NetworkChangeNotifier::IPAddressObserver {
diff --git a/net/base/host_resolver_proc.h b/net/base/host_resolver_proc.h
index b5c61c4..2b8b04e 100644
--- a/net/base/host_resolver_proc.h
+++ b/net/base/host_resolver_proc.h
@@ -10,7 +10,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "net/base/address_family.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
@@ -23,7 +23,7 @@ class AddressList;
 //
 // Note that implementations of HostResolverProc *MUST BE THREADSAFE*, since
 // the HostResolver implementation using them can be multi-threaded.
-class NET_API HostResolverProc
+class NET_EXPORT HostResolverProc
     : public base::RefCountedThreadSafe<HostResolverProc> {
  public:
   explicit HostResolverProc(HostResolverProc* previous);
@@ -85,11 +85,12 @@ class NET_API HostResolverProc
 // |addrlist| with a list of socket addresses. Otherwise returns a
 // network error code, and fills |os_error| with a more specific errir if it
 // was non-NULL.
-NET_TEST int SystemHostResolverProc(const std::string& host,
-                                    AddressFamily address_family,
-                                    HostResolverFlags host_resolver_flags,
-                                    AddressList* addrlist,
-                                    int* os_error);
+NET_EXPORT_PRIVATE int SystemHostResolverProc(
+    const std::string& host,
+    AddressFamily address_family,
+    HostResolverFlags host_resolver_flags,
+    AddressList* addrlist,
+    int* os_error);
 
 }  // namespace net
 
diff --git a/net/base/io_buffer.h b/net/base/io_buffer.h
index e117cce..1451dec 100644
--- a/net/base/io_buffer.h
+++ b/net/base/io_buffer.h
@@ -11,13 +11,13 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/pickle.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
 // This is a simple wrapper around a buffer that provides ref counting for
 // easier asynchronous IO handling.
-class NET_API IOBuffer : public base::RefCountedThreadSafe<IOBuffer> {
+class NET_EXPORT IOBuffer : public base::RefCountedThreadSafe<IOBuffer> {
  public:
   IOBuffer();
   explicit IOBuffer(int buffer_size);
@@ -40,7 +40,7 @@ class NET_API IOBuffer : public base::RefCountedThreadSafe<IOBuffer> {
 // doesn't have to keep track of that value.
 // NOTE: This doesn't mean that we want to stop sending the size as an explicit
 // argument to IO functions. Please keep using IOBuffer* for API declarations.
-class NET_API IOBufferWithSize : public IOBuffer {
+class NET_EXPORT IOBufferWithSize : public IOBuffer {
  public:
   explicit IOBufferWithSize(int size);
 
@@ -54,7 +54,7 @@ class NET_API IOBufferWithSize : public IOBuffer {
 
 // This is a read only IOBuffer.  The data is stored in a string and
 // the IOBuffer interface does not provide a proper way to modify it.
-class NET_API StringIOBuffer : public IOBuffer {
+class NET_EXPORT StringIOBuffer : public IOBuffer {
  public:
   explicit StringIOBuffer(const std::string& s);
 
@@ -68,7 +68,7 @@ class NET_API StringIOBuffer : public IOBuffer {
 
 // This version wraps an existing IOBuffer and provides convenient functions
 // to progressively read all the data.
-class NET_API DrainableIOBuffer : public IOBuffer {
+class NET_EXPORT DrainableIOBuffer : public IOBuffer {
  public:
   DrainableIOBuffer(IOBuffer* base, int size);
 
@@ -97,7 +97,7 @@ class NET_API DrainableIOBuffer : public IOBuffer {
 };
 
 // This version provides a resizable buffer and a changeable offset.
-class NET_API GrowableIOBuffer : public IOBuffer {
+class NET_EXPORT GrowableIOBuffer : public IOBuffer {
  public:
   GrowableIOBuffer();
 
@@ -122,7 +122,7 @@ class NET_API GrowableIOBuffer : public IOBuffer {
 
 // This versions allows a pickle to be used as the storage for a write-style
 // operation, avoiding an extra data copy.
-class NET_API PickledIOBuffer : public IOBuffer {
+class NET_EXPORT PickledIOBuffer : public IOBuffer {
  public:
   PickledIOBuffer();
 
@@ -143,7 +143,7 @@ class NET_API PickledIOBuffer : public IOBuffer {
 // A good example is the buffer for a synchronous operation, where we can be
 // sure that nobody is keeping an extra reference to this object so the lifetime
 // of the buffer can be completely managed by its intended owner.
-class NET_API WrappedIOBuffer : public IOBuffer {
+class NET_EXPORT WrappedIOBuffer : public IOBuffer {
  public:
   explicit WrappedIOBuffer(const char* data);
 
diff --git a/net/base/ip_endpoint.h b/net/base/ip_endpoint.h
index cc6fd1d..1c8c907 100644
--- a/net/base/ip_endpoint.h
+++ b/net/base/ip_endpoint.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/basictypes.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/base/net_util.h"
 
 struct sockaddr;
@@ -17,7 +17,7 @@ namespace net {
 // An IPEndPoint represents the address of a transport endpoint:
 //  * IP address (either v4 or v6)
 //  * Port
-class NET_API IPEndPoint {
+class NET_EXPORT IPEndPoint {
  public:
   IPEndPoint();
   virtual ~IPEndPoint();
diff --git a/net/base/keygen_handler.h b/net/base/keygen_handler.h
index 990b41d2..ea56a96 100644
--- a/net/base/keygen_handler.h
+++ b/net/base/keygen_handler.h
@@ -11,7 +11,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "build/build_config.h"
 #include "googleurl/src/gurl.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 #if defined(USE_NSS)
 #include "crypto/crypto_module_blocking_password_delegate.h"
@@ -24,7 +24,7 @@ namespace net {
 // <http://dev.w3.org/html5/spec/Overview.html#the-keygen-element>
 // <https://developer.mozilla.org/En/HTML/HTML_Extensions/KEYGEN_Tag>
 
-class NET_API KeygenHandler {
+class NET_EXPORT KeygenHandler {
  public:
   // Creates a handler that will generate a key with the given key size and
   // incorporate the |challenge| into the Netscape SPKAC structure. The request
diff --git a/net/base/listen_socket.h b/net/base/listen_socket.h
index 80772038..fcf06b9 100644
--- a/net/base/listen_socket.h
+++ b/net/base/listen_socket.h
@@ -27,7 +27,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 #if defined(OS_POSIX)
 typedef int SOCKET;
@@ -36,11 +36,11 @@ typedef int SOCKET;
 namespace net {
 
 // Implements a raw socket interface
-class NET_API ListenSocket : public base::RefCountedThreadSafe<ListenSocket>,
+class NET_EXPORT ListenSocket : public base::RefCountedThreadSafe<ListenSocket>,
 #if defined(OS_WIN)
-                             public base::win::ObjectWatcher::Delegate {
+                                public base::win::ObjectWatcher::Delegate {
 #elif defined(OS_POSIX)
-                             public MessageLoopForIO::Watcher {
+                                public MessageLoopForIO::Watcher {
 #endif
  public:
   // TODO(erikkay): this delegate should really be split into two parts
diff --git a/net/base/mapped_host_resolver.h b/net/base/mapped_host_resolver.h
index a589fa3..d49e45f 100644
--- a/net/base/mapped_host_resolver.h
+++ b/net/base/mapped_host_resolver.h
@@ -11,7 +11,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "net/base/host_mapping_rules.h"
 #include "net/base/host_resolver.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
@@ -19,7 +19,7 @@ namespace net {
 // request before passing it off to |impl|. This is different from
 // MockHostResolver which does the remapping at the HostResolverProc
 // layer, so it is able to preserve the effectiveness of the cache.
-class NET_API MappedHostResolver : public HostResolver {
+class NET_EXPORT MappedHostResolver : public HostResolver {
  public:
   // Creates a MappedHostResolver that forwards all of its requests through
   // |impl|.  It takes ownership of |impl|.
diff --git a/net/base/mime_sniffer.h b/net/base/mime_sniffer.h
index f6a1175..7d905e2 100644
--- a/net/base/mime_sniffer.h
+++ b/net/base/mime_sniffer.h
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 class GURL;
 
@@ -26,7 +26,8 @@ const int kMaxBytesToSniff = 1024;
 // @param url The URL from which we obtained the content.
 // @param mime_type The current mime type, e.g. from the Content-Type header.
 // @return Returns true if we should sniff the mime type.
-NET_API bool ShouldSniffMimeType(const GURL& url, const std::string& mime_type);
+NET_EXPORT bool ShouldSniffMimeType(const GURL& url,
+                                    const std::string& mime_type);
 
 // Guess a mime type from the first few bytes of content an its URL.  Always
 // assigns |result| with its best guess of a mime type.
@@ -37,9 +38,9 @@ NET_API bool ShouldSniffMimeType(const GURL& url, const std::string& mime_type);
 // @param type_hint The current mime type, e.g. from the Content-Type header.
 // @param result Address at which to place the sniffed mime type.
 // @return Returns true if we have enough content to guess the mime type.
-NET_API bool SniffMimeType(const char* content, size_t content_size,
-                           const GURL& url, const std::string& type_hint,
-                           std::string* result);
+NET_EXPORT bool SniffMimeType(const char* content, size_t content_size,
+                              const GURL& url, const std::string& type_hint,
+                              std::string* result);
 
 }  // namespace net
 
diff --git a/net/base/mime_util.h b/net/base/mime_util.h
index 545abe0..7640504 100644
--- a/net/base/mime_util.h
+++ b/net/base/mime_util.h
@@ -10,98 +10,103 @@
 #include <vector>
 
 #include "base/file_path.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
 // Get the mime type (if any) that is associated with the given file extension.
 // Returns true if a corresponding mime type exists.
-NET_API bool GetMimeTypeFromExtension(const FilePath::StringType& ext,
-                                      std::string* mime_type);
+NET_EXPORT bool GetMimeTypeFromExtension(const FilePath::StringType& ext,
+                                         std::string* mime_type);
 
 // Get the mime type (if any) that is associated with the given file extension.
 // Returns true if a corresponding mime type exists. In this method,
 // the search for a mime type is constrained to a limited set of
 // types known to the net library, the OS/registry is not consulted.
-NET_API bool GetWellKnownMimeTypeFromExtension(const FilePath::StringType& ext,
-                                               std::string* mime_type);
+NET_EXPORT bool GetWellKnownMimeTypeFromExtension(
+    const FilePath::StringType& ext,
+    std::string* mime_type);
 
 // Get the mime type (if any) that is associated with the given file.  Returns
 // true if a corresponding mime type exists.
-NET_API bool GetMimeTypeFromFile(const FilePath& file_path,
-                                 std::string* mime_type);
+NET_EXPORT bool GetMimeTypeFromFile(const FilePath& file_path,
+                                    std::string* mime_type);
 
 // Get the preferred extension (if any) associated with the given mime type.
 // Returns true if a corresponding file extension exists.  The extension is
 // returned without a prefixed dot, ex "html".
-NET_API bool GetPreferredExtensionForMimeType(const std::string& mime_type,
-                                              FilePath::StringType* extension);
+NET_EXPORT bool GetPreferredExtensionForMimeType(
+    const std::string& mime_type,
+    FilePath::StringType* extension);
 
 // Check to see if a particular MIME type is in our list.
-NET_API bool IsSupportedImageMimeType(const char* mime_type);
-NET_API bool IsSupportedMediaMimeType(const char* mime_type);
-NET_API bool IsSupportedNonImageMimeType(const char* mime_type);
-NET_API bool IsSupportedJavascriptMimeType(const char* mime_type);
+NET_EXPORT bool IsSupportedImageMimeType(const char* mime_type);
+NET_EXPORT bool IsSupportedMediaMimeType(const char* mime_type);
+NET_EXPORT bool IsSupportedNonImageMimeType(const char* mime_type);
+NET_EXPORT bool IsSupportedJavascriptMimeType(const char* mime_type);
 
 // Get whether this mime type should be displayed in view-source mode.
 // (For example, XML.)
-NET_API bool IsViewSourceMimeType(const char* mime_type);
+NET_EXPORT bool IsViewSourceMimeType(const char* mime_type);
 
 // Convenience function.
-NET_API bool IsSupportedMimeType(const std::string& mime_type);
+NET_EXPORT bool IsSupportedMimeType(const std::string& mime_type);
 
 // Returns true if this the mime_type_pattern matches a given mime-type.
 // Checks for absolute matching and wildcards.  mime-types should be in
 // lower case.
-NET_API bool MatchesMimeType(const std::string &mime_type_pattern,
+NET_EXPORT bool MatchesMimeType(const std::string &mime_type_pattern,
                              const std::string &mime_type);
 
 // Returns true if and only if all codecs are supported, false otherwise.
-NET_API bool AreSupportedMediaCodecs(const std::vector<std::string>& codecs);
+NET_EXPORT bool AreSupportedMediaCodecs(const std::vector<std::string>& codecs);
 
 // Parses a codec string, populating |codecs_out| with the prefix of each codec
 // in the string |codecs_in|. For example, passed "aaa.b.c,dd.eee", if
 // |strip| == true |codecs_out| will contain {"aaa", "dd"}, if |strip| == false
 // |codecs_out| will contain {"aaa.b.c", "dd.eee"}.
 // See http://www.ietf.org/rfc/rfc4281.txt.
-NET_API void ParseCodecString(const std::string& codecs,
-                              std::vector<std::string>* codecs_out,
-                              bool strip);
+NET_EXPORT void ParseCodecString(const std::string& codecs,
+                                 std::vector<std::string>* codecs_out,
+                                 bool strip);
 
 // Check to see if a particular MIME type is in our list which only supports a
 // certain subset of codecs.
-NET_API bool IsStrictMediaMimeType(const std::string& mime_type);
+NET_EXPORT bool IsStrictMediaMimeType(const std::string& mime_type);
 
 // Check to see if a particular MIME type is in our list which only supports a
 // certain subset of codecs. Returns true if and only if all codecs are
 // supported for that specific MIME type, false otherwise. If this returns
 // false you will still need to check if the media MIME tpyes and codecs are
 // supported.
-NET_API bool IsSupportedStrictMediaMimeType(
+NET_EXPORT bool IsSupportedStrictMediaMimeType(
     const std::string& mime_type,
     const std::vector<std::string>& codecs);
 
 // Get the extensions for images files.
 // Note that we do not erase the existing elements in the the provided vector.
 // Instead, we append the result to it.
-NET_API void GetImageExtensions(std::vector<FilePath::StringType>* extensions);
+NET_EXPORT void GetImageExtensions(
+    std::vector<FilePath::StringType>* extensions);
 
 // Get the extensions for audio files.
 // Note that we do not erase the existing elements in the the provided vector.
 // Instead, we append the result to it.
-NET_API void GetAudioExtensions(std::vector<FilePath::StringType>* extensions);
+NET_EXPORT void GetAudioExtensions(
+    std::vector<FilePath::StringType>* extensions);
 
 // Get the extensions for video files.
 // Note that we do not erase the existing elements in the the provided vector.
 // Instead, we append the result to it.
-NET_API void GetVideoExtensions(std::vector<FilePath::StringType>* extensions);
+NET_EXPORT void GetVideoExtensions(
+    std::vector<FilePath::StringType>* extensions);
 
 // Get the extensions associated with the given mime type.
 // There could be multiple extensions for a given mime type, like "html,htm"
 // for "text/html".
 // Note that we do not erase the existing elements in the the provided vector.
 // Instead, we append the result to it.
-NET_API void GetExtensionsForMimeType(
+NET_EXPORT void GetExtensionsForMimeType(
     const std::string& mime_type,
     std::vector<FilePath::StringType>* extensions);
 
diff --git a/net/base/net_api.h b/net/base/net_api.h
deleted file mode 100644
index 8c6c9dfa..0000000
--- a/net/base/net_api.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// 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.
-
-#ifndef NET_BASE_NET_API_H_
-#define NET_BASE_NET_API_H_
-#pragma once
-
-// Defines NET_API so that functionality implemented by the net module can be
-// exported to consumers, and NET_TEST that allows unit tests to access features
-// not intended to be used directly by real consumers.
-
-#if defined(COMPONENT_BUILD)
-#if defined(WIN32)
-
-#if defined(NET_IMPLEMENTATION)
-#define NET_API __declspec(dllexport)
-#define NET_TEST __declspec(dllexport)
-#else
-#define NET_API __declspec(dllimport)
-#define NET_TEST __declspec(dllimport)
-#endif  // defined(NET_IMPLEMENTATION)
-
-#else  // defined(WIN32)
-#define NET_API __attribute__((visibility("default")))
-#define NET_TEST __attribute__((visibility("default")))
-#endif
-
-#else  /// defined(COMPONENT_BUILD)
-#define NET_API
-#define NET_TEST
-#endif
-
-#endif  // NET_BASE_NET_API_H_
diff --git a/net/base/net_errors.h b/net/base/net_errors.h
index a12813d..761c2d2 100644
--- a/net/base/net_errors.h
+++ b/net/base/net_errors.h
@@ -9,12 +9,12 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
 // Error domain of the net module's error codes.
-NET_API extern const char kErrorDomain[];
+NET_EXPORT extern const char kErrorDomain[];
 
 // Error values are negative.
 enum Error {
@@ -30,7 +30,7 @@ enum Error {
 };
 
 // Returns a textual representation of the error code for logging purposes.
-NET_API const char* ErrorToString(int error);
+NET_EXPORT const char* ErrorToString(int error);
 
 // Returns true if |error| is a certificate error code.
 inline bool IsCertificateError(int error) {
@@ -40,7 +40,7 @@ inline bool IsCertificateError(int error) {
 }
 
 // Map system error code to Error.
-NET_API Error MapSystemError(int os_error);
+NET_EXPORT Error MapSystemError(int os_error);
 
 // Returns a list of all the possible net error codes (not counting OK). This
 // is intended for use with UMA histograms that are reporting the result of
diff --git a/net/base/net_export.h b/net/base/net_export.h
new file mode 100644
index 0000000..f212d20
--- /dev/null
+++ b/net/base/net_export.h
@@ -0,0 +1,34 @@
+// 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.
+
+#ifndef NET_BASE_NET_EXPORT_H_
+#define NET_BASE_NET_EXPORT_H_
+#pragma once
+
+// Defines NET_EXPORT so that functionality implemented by the net module can
+// be exported to consumers, and NET_EXPORT_PRIVATE that allows unit tests to
+// access features not intended to be used directly by real consumers.
+
+#if defined(COMPONENT_BUILD)
+#if defined(WIN32)
+
+#if defined(NET_IMPLEMENTATION)
+#define NET_EXPORT __declspec(dllexport)
+#define NET_EXPORT_PRIVATE __declspec(dllexport)
+#else
+#define NET_EXPORT __declspec(dllimport)
+#define NET_EXPORT_PRIVATE __declspec(dllimport)
+#endif  // defined(NET_IMPLEMENTATION)
+
+#else  // defined(WIN32)
+#define NET_EXPORT __attribute__((visibility("default")))
+#define NET_EXPORT_PRIVATE __attribute__((visibility("default")))
+#endif
+
+#else  /// defined(COMPONENT_BUILD)
+#define NET_EXPORT
+#define NET_EXPORT_PRIVATE
+#endif
+
+#endif  // NET_BASE_NET_EXPORT_H_
diff --git a/net/base/net_log.h b/net/base/net_log.h
index 97efb27..d413136 100644
--- a/net/base/net_log.h
+++ b/net/base/net_log.h
@@ -11,7 +11,7 @@
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace base {
 class Value;
@@ -32,7 +32,7 @@ namespace net {
 // is usually accessed through a BoundNetLog, which will always pass in a
 // specific source ID.
 //
-class NET_API NetLog {
+class NET_EXPORT NetLog {
  public:
   enum EventType {
 #define EVENT_TYPE(label) TYPE_ ## label,
@@ -58,7 +58,7 @@ class NET_API NetLog {
   // Identifies the entity that generated this log. The |id| field should
   // uniquely identify the source, and is used by log observers to infer
   // message groupings. Can use NetLog::NextID() to create unique IDs.
-  struct NET_API Source {
+  struct NET_EXPORT Source {
     static const uint32 kInvalidId = 0;
 
     Source() : type(SOURCE_NONE), id(kInvalidId) {}
@@ -75,7 +75,7 @@ class NET_API NetLog {
   // Base class for associating additional parameters with an event. Log
   // observers need to know what specific derivations of EventParameters a
   // particular EventType uses, in order to get at the individual components.
-  class NET_API EventParameters
+  class NET_EXPORT EventParameters
       : public base::RefCountedThreadSafe<EventParameters> {
    public:
     EventParameters() {}
@@ -106,7 +106,7 @@ class NET_API NetLog {
 
   // An observer, that must ensure its own thread safety, for events
   // being added to a NetLog.
-  class NET_API ThreadSafeObserver {
+  class NET_EXPORT ThreadSafeObserver {
    public:
     // Constructs an observer that wants to see network events, with
     // the specified minimum event granularity.  A ThreadSafeObserver can only
@@ -213,7 +213,7 @@ class NET_API NetLog {
 
 // Helper that binds a Source to a NetLog, and exposes convenience methods to
 // output log messages without needing to pass in the source.
-class NET_API BoundNetLog {
+class NET_EXPORT BoundNetLog {
  public:
   BoundNetLog() : net_log_(NULL) {}
 
@@ -315,7 +315,7 @@ class NetLogIntegerParameter : public NetLog::EventParameters {
 
 // NetLogSourceParameter is a subclass of EventParameters that encapsulates a
 // single NetLog::Source parameter.
-class NET_API NetLogSourceParameter : public NetLog::EventParameters {
+class NET_EXPORT NetLogSourceParameter : public NetLog::EventParameters {
  public:
   // |name| must be a string literal.
   NetLogSourceParameter(const char* name, const NetLog::Source& value)
@@ -334,7 +334,7 @@ class NET_API NetLogSourceParameter : public NetLog::EventParameters {
 
 // ScopedNetLogEvent logs a begin event on creation, and the corresponding end
 // event on destruction.
-class NET_TEST ScopedNetLogEvent {
+class NET_EXPORT_PRIVATE ScopedNetLogEvent {
  public:
   ScopedNetLogEvent(const BoundNetLog& net_log,
                     NetLog::EventType event_type,
diff --git a/net/base/net_module.h b/net/base/net_module.h
index 16289b1..7dbbda6 100644
--- a/net/base/net_module.h
+++ b/net/base/net_module.h
@@ -8,7 +8,7 @@
 
 #include "base/basictypes.h"
 #include "base/string_piece.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
@@ -19,7 +19,7 @@ namespace net {
 // cannot see the ResourceBundle class used by Chrome), so it uses this API to
 // get access to such resources.
 //
-class NET_API NetModule {
+class NET_EXPORT NetModule {
  public:
   typedef base::StringPiece (*ResourceProvider)(int key);
 
diff --git a/net/base/net_util.h b/net/base/net_util.h
index ee9fe12..76e49f6 100644
--- a/net/base/net_util.h
+++ b/net/base/net_util.h
@@ -23,7 +23,7 @@
 #include "base/basictypes.h"
 #include "base/string16.h"
 #include "net/base/escape.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 struct addrinfo;
 class FilePath;
@@ -60,33 +60,33 @@ class QuoteRule {
 };
 
 // Nothing is ommitted.
-NET_API extern const FormatUrlType kFormatUrlOmitNothing;
+NET_EXPORT extern const FormatUrlType kFormatUrlOmitNothing;
 
 // If set, any username and password are removed.
-NET_API extern const FormatUrlType kFormatUrlOmitUsernamePassword;
+NET_EXPORT extern const FormatUrlType kFormatUrlOmitUsernamePassword;
 
 // If the scheme is 'http://', it's removed.
-NET_API extern const FormatUrlType kFormatUrlOmitHTTP;
+NET_EXPORT extern const FormatUrlType kFormatUrlOmitHTTP;
 
 // Omits the path if it is just a slash and there is no query or ref.  This is
 // meaningful for non-file "standard" URLs.
-NET_API extern const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname;
+NET_EXPORT extern const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname;
 
 // Convenience for omitting all unecessary types.
-NET_API extern const FormatUrlType kFormatUrlOmitAll;
+NET_EXPORT extern const FormatUrlType kFormatUrlOmitAll;
 
 // Holds a list of ports that should be accepted despite bans.
-NET_TEST extern std::multiset<int> explicitly_allowed_ports;
+NET_EXPORT_PRIVATE extern std::multiset<int> explicitly_allowed_ports;
 
 // Given the full path to a file name, creates a file: URL. The returned URL
 // may not be valid if the input is malformed.
-NET_API GURL FilePathToFileURL(const FilePath& path);
+NET_EXPORT GURL FilePathToFileURL(const FilePath& path);
 
 // Converts a file: URL back to a filename that can be passed to the OS. The
 // file URL must be well-formed (GURL::is_valid() must return true); we don't
 // handle degenerate cases here. Returns true on success, false if it isn't a
 // valid file URL. On failure, *file_path will be empty.
-NET_API bool FileURLToFilePath(const GURL& url, FilePath* file_path);
+NET_EXPORT bool FileURLToFilePath(const GURL& url, FilePath* file_path);
 
 // Splits an input of the form <host>[":"<port>] into its consitituent parts.
 // Saves the result into |*host| and |*port|. If the input did not have
@@ -94,59 +94,61 @@ NET_API bool FileURLToFilePath(const GURL& url, FilePath* file_path);
 // Returns true if the parsing was successful, false otherwise.
 // The returned host is NOT canonicalized, and may be invalid. If <host> is
 // an IPv6 literal address, the returned host includes the square brackets.
-NET_TEST bool ParseHostAndPort(std::string::const_iterator host_and_port_begin,
-                               std::string::const_iterator host_and_port_end,
-                               std::string* host,
-                               int* port);
-NET_TEST bool ParseHostAndPort(const std::string& host_and_port,
-                               std::string* host,
-                               int* port);
+NET_EXPORT_PRIVATE bool ParseHostAndPort(
+    std::string::const_iterator host_and_port_begin,
+    std::string::const_iterator host_and_port_end,
+    std::string* host,
+    int* port);
+NET_EXPORT_PRIVATE bool ParseHostAndPort(
+    const std::string& host_and_port,
+    std::string* host,
+    int* port);
 
 // Returns a host:port string for the given URL.
-NET_API std::string GetHostAndPort(const GURL& url);
+NET_EXPORT std::string GetHostAndPort(const GURL& url);
 
 // Returns a host[:port] string for the given URL, where the port is omitted
 // if it is the default for the URL's scheme.
-NET_TEST std::string GetHostAndOptionalPort(const GURL& url);
+NET_EXPORT_PRIVATE std::string GetHostAndOptionalPort(const GURL& url);
 
 // Returns the string representation of an address, like "192.168.0.1".
 // Returns empty string on failure.
-NET_API std::string NetAddressToString(const struct addrinfo* net_address);
-NET_API std::string NetAddressToString(const struct sockaddr* net_address,
-                                       socklen_t address_len);
+NET_EXPORT std::string NetAddressToString(const struct addrinfo* net_address);
+NET_EXPORT std::string NetAddressToString(const struct sockaddr* net_address,
+                                          socklen_t address_len);
 
 // Same as NetAddressToString, but additionally includes the port number. For
 // example: "192.168.0.1:99" or "[::1]:80".
-NET_API std::string NetAddressToStringWithPort(
+NET_EXPORT std::string NetAddressToStringWithPort(
     const struct addrinfo* net_address);
-NET_API std::string NetAddressToStringWithPort(
+NET_EXPORT std::string NetAddressToStringWithPort(
     const struct sockaddr* net_address,
     socklen_t address_len);
 
 // Returns the hostname of the current system. Returns empty string on failure.
-NET_API std::string GetHostName();
+NET_EXPORT std::string GetHostName();
 
 // Extracts the unescaped username/password from |url|, saving the results
 // into |*username| and |*password|.
-NET_TEST void GetIdentityFromURL(const GURL& url,
+NET_EXPORT_PRIVATE void GetIdentityFromURL(const GURL& url,
                         string16* username,
                         string16* password);
 
 // Returns either the host from |url|, or, if the host is empty, the full spec.
-NET_API std::string GetHostOrSpecFromURL(const GURL& url);
+NET_EXPORT std::string GetHostOrSpecFromURL(const GURL& url);
 
 // Return the value of the HTTP response header with name 'name'.  'headers'
 // should be in the format that URLRequest::GetResponseHeaders() returns.
 // Returns the empty string if the header is not found.
-NET_API std::string GetSpecificHeader(const std::string& headers,
-                                      const std::string& name);
+NET_EXPORT std::string GetSpecificHeader(const std::string& headers,
+                                         const std::string& name);
 
 // Return the value of the HTTP response header field's parameter named
 // 'param_name'.  Returns the empty string if the parameter is not found or is
 // improperly formatted.
-NET_API std::string GetHeaderParamValue(const std::string& header,
-                                        const std::string& param_name,
-                                        QuoteRule::Type quote_rule);
+NET_EXPORT std::string GetHeaderParamValue(const std::string& header,
+                                           const std::string& param_name,
+                                           QuoteRule::Type quote_rule);
 
 // Return the filename extracted from Content-Disposition header. The following
 // formats are tried in order listed below:
@@ -170,8 +172,9 @@ NET_API std::string GetHeaderParamValue(const std::string& header,
 //
 // This function does not do any escaping and callers are responsible for
 // escaping 'unsafe' characters (e.g. (back)slash, colon) as they see fit.
-NET_TEST std::string GetFileNameFromCD(const std::string& header,
-                                       const std::string& referrer_charset);
+NET_EXPORT_PRIVATE std::string GetFileNameFromCD(
+    const std::string& header,
+    const std::string& referrer_charset);
 
 // Converts the given host name to unicode characters. This can be called for
 // any host name, if the input is not IDN or is invalid in some way, we'll just
@@ -188,13 +191,13 @@ NET_TEST std::string GetFileNameFromCD(const std::string& header,
 // Latin letters in the ASCII range can be mixed with a limited set of
 // script-language pairs (currently Han, Kana and Hangul for zh,ja and ko).
 // When |languages| is empty, even that mixing is not allowed.
-NET_API string16 IDNToUnicode(const std::string& host,
-                              const std::string& languages);
+NET_EXPORT string16 IDNToUnicode(const std::string& host,
+                                 const std::string& languages);
 
 // Canonicalizes |host| and returns it.  Also fills |host_info| with
 // IP address information.  |host_info| must not be NULL.
-NET_API std::string CanonicalizeHost(const std::string& host,
-                                     url_canon::CanonHostInfo* host_info);
+NET_EXPORT std::string CanonicalizeHost(const std::string& host,
+                                        url_canon::CanonHostInfo* host_info);
 
 // Returns true if |host| is not an IP address and is compliant with a set of
 // rules based on RFC 1738 and tweaked to be compatible with the real world.
@@ -212,12 +215,12 @@ NET_API std::string CanonicalizeHost(const std::string& host,
 //
 // NOTE: You should only pass in hosts that have been returned from
 // CanonicalizeHost(), or you may not get accurate results.
-NET_API bool IsCanonicalizedHostCompliant(const std::string& host,
-                                          const std::string& desired_tld);
+NET_EXPORT bool IsCanonicalizedHostCompliant(const std::string& host,
+                                             const std::string& desired_tld);
 
 // Call these functions to get the html snippet for a directory listing.
 // The return values of both functions are in UTF-8.
-NET_API std::string GetDirectoryListingHeader(const string16& title);
+NET_EXPORT std::string GetDirectoryListingHeader(const string16& title);
 
 // Given the name of a file in a directory (ftp or local) and
 // other information (is_dir, size, modification time), it returns
@@ -231,14 +234,14 @@ NET_API std::string GetDirectoryListingHeader(const string16& title);
 // will be used.
 //
 // Both |name| and |raw_bytes| are escaped internally.
-NET_API std::string GetDirectoryListingEntry(const string16& name,
-                                             const std::string& raw_bytes,
-                                             bool is_dir, int64 size,
-                                             base::Time modified);
+NET_EXPORT std::string GetDirectoryListingEntry(const string16& name,
+                                                const std::string& raw_bytes,
+                                                bool is_dir, int64 size,
+                                                base::Time modified);
 
 // If text starts with "www." it is removed, otherwise text is returned
 // unmodified.
-NET_API string16 StripWWW(const string16& text);
+NET_EXPORT string16 StripWWW(const string16& text);
 
 // Gets the filename in the following order:
 // 1) the raw Content-Disposition header (as read from the network).
@@ -249,11 +252,11 @@ NET_API string16 StripWWW(const string16& text);
 // 3) the last path component name or hostname from |url|
 // 4) the given |default_name|
 // 5) the hard-coded name "download", as the last resort
-NET_API string16 GetSuggestedFilename(const GURL& url,
-                                      const std::string& content_disposition,
-                                      const std::string& referrer_charset,
-                                      const std::string& suggested_name,
-                                      const string16& default_name);
+NET_EXPORT string16 GetSuggestedFilename(const GURL& url,
+                                         const std::string& content_disposition,
+                                         const std::string& referrer_charset,
+                                         const std::string& suggested_name,
+                                         const string16& default_name);
 
 // Generate a filename based on a HTTP request.
 //
@@ -261,12 +264,12 @@ NET_API string16 GetSuggestedFilename(const GURL& url,
 // |default_name| parameters will be used with GetSuggestedFilename() to
 // generate a filename.  The resulting filename will be passed in along with the
 // |mime_type| to GenerateSafeFileName() to generate the returned filename.
-NET_API FilePath GenerateFileName(const GURL& url,
-                                  const std::string& content_disposition,
-                                  const std::string& referrer_charset,
-                                  const std::string& suggested_name,
-                                  const std::string& mime_type,
-                                  const string16& default_name);
+NET_EXPORT FilePath GenerateFileName(const GURL& url,
+                                     const std::string& content_disposition,
+                                     const std::string& referrer_charset,
+                                     const std::string& suggested_name,
+                                     const std::string& mime_type,
+                                     const string16& default_name);
 
 // Ensures that the filename and extension is safe to use in the filesystem.
 //
@@ -285,8 +288,8 @@ NET_API FilePath GenerateFileName(const GURL& url,
 //
 // Note: |mime_type| should only be non-empty if this function is called from a
 // thread that allows IO.
-NET_API void GenerateSafeFileName(const std::string& mime_type,
-                                  FilePath* file_path);
+NET_EXPORT void GenerateSafeFileName(const std::string& mime_type,
+                                     FilePath* file_path);
 
 // Checks the given port against a list of ports which are restricted by
 // default.  Returns true if the port is allowed, false if it is restricted.
@@ -302,13 +305,13 @@ bool IsPortAllowedByFtp(int port);
 bool IsPortAllowedByOverride(int port);
 
 // Set socket to non-blocking mode
-NET_API int SetNonBlocking(int fd);
+NET_EXPORT int SetNonBlocking(int fd);
 
 // Formats the host in |url| and appends it to |output|.  The host formatter
 // takes the same accept languages component as ElideURL().
-NET_API void AppendFormattedHost(const GURL& url,
-                                 const std::string& languages,
-                                 string16* output);
+NET_EXPORT void AppendFormattedHost(const GURL& url,
+                                    const std::string& languages,
+                                    string16* output);
 
 // Creates a string representation of |url|. The IDN host name may be in Unicode
 // if |languages| accepts the Unicode representation. |format_type| is a bitmask
@@ -331,14 +334,14 @@ NET_API void AppendFormattedHost(const GURL& url,
 // into the middle of a component that was entirely removed, past the end of the
 // string, or into the middle of an encoding sequence), it will be set to
 // string16::npos.
-NET_API string16 FormatUrl(const GURL& url,
-                           const std::string& languages,
-                           FormatUrlTypes format_types,
-                           UnescapeRule::Type unescape_rules,
-                           url_parse::Parsed* new_parsed,
-                           size_t* prefix_end,
-                           size_t* offset_for_adjustment);
-NET_API string16 FormatUrlWithOffsets(
+NET_EXPORT string16 FormatUrl(const GURL& url,
+                              const std::string& languages,
+                              FormatUrlTypes format_types,
+                              UnescapeRule::Type unescape_rules,
+                              url_parse::Parsed* new_parsed,
+                              size_t* prefix_end,
+                              size_t* offset_for_adjustment);
+NET_EXPORT string16 FormatUrlWithOffsets(
     const GURL& url,
     const std::string& languages,
     FormatUrlTypes format_types,
@@ -358,16 +361,16 @@ inline string16 FormatUrl(const GURL& url, const std::string& languages) {
 
 // Returns whether FormatUrl() would strip a trailing slash from |url|, given a
 // format flag including kFormatUrlOmitTrailingSlashOnBareHostname.
-NET_API bool CanStripTrailingSlash(const GURL& url);
+NET_EXPORT bool CanStripTrailingSlash(const GURL& url);
 
 // Strip the portions of |url| that aren't core to the network request.
 //   - user name / password
 //   - reference section
-NET_TEST GURL SimplifyUrlForRequest(const GURL& url);
+NET_EXPORT_PRIVATE GURL SimplifyUrlForRequest(const GURL& url);
 
-NET_API void SetExplicitlyAllowedPorts(const std::string& allowed_ports);
+NET_EXPORT void SetExplicitlyAllowedPorts(const std::string& allowed_ports);
 
-class NET_API ScopedPortException {
+class NET_EXPORT ScopedPortException {
  public:
   ScopedPortException(int port);
   ~ScopedPortException();
@@ -381,7 +384,7 @@ class NET_API ScopedPortException {
 // Perform a simplistic test to see if IPv6 is supported by trying to create an
 // IPv6 socket.
 // TODO(jar): Make test more in-depth as needed.
-NET_API bool IPv6Supported();
+NET_EXPORT bool IPv6Supported();
 
 // Returns true if it can determine that only loopback addresses are configured.
 // i.e. if only 127.0.0.1 and ::1 are routable.
@@ -400,12 +403,12 @@ static const size_t kIPv6AddressSize = 16;
 
 // Parses an IP address literal (either IPv4 or IPv6) to its numeric value.
 // Returns true on success and fills |ip_number| with the numeric value.
-NET_TEST bool ParseIPLiteralToNumber(const std::string& ip_literal,
-                                     IPAddressNumber* ip_number);
+NET_EXPORT_PRIVATE bool ParseIPLiteralToNumber(const std::string& ip_literal,
+                                               IPAddressNumber* ip_number);
 
 // Converts an IPv4 address to an IPv4-mapped IPv6 address.
 // For example 192.168.0.1 would be converted to ::ffff:192.168.0.1.
-NET_TEST IPAddressNumber ConvertIPv4NumberToIPv6Number(
+NET_EXPORT_PRIVATE IPAddressNumber ConvertIPv4NumberToIPv6Number(
     const IPAddressNumber& ipv4_number);
 
 // Parses an IP block specifier from CIDR notation to an
@@ -418,9 +421,9 @@ NET_TEST IPAddressNumber ConvertIPv4NumberToIPv6Number(
 //    10.10.3.1/20
 //    a:b:c::/46
 //    ::1/128
-NET_API bool ParseCIDRBlock(const std::string& cidr_literal,
-                            IPAddressNumber* ip_number,
-                            size_t* prefix_length_in_bits);
+NET_EXPORT bool ParseCIDRBlock(const std::string& cidr_literal,
+                               IPAddressNumber* ip_number,
+                               size_t* prefix_length_in_bits);
 
 // Compares an IP address to see if it falls within the specified IP block.
 // Returns true if it does, false otherwise.
@@ -432,9 +435,9 @@ NET_API bool ParseCIDRBlock(const std::string& cidr_literal,
 // In cases when an IPv4 address is being compared to an IPv6 address prefix
 // and vice versa, the IPv4 addresses will be converted to IPv4-mapped
 // (IPv6) addresses.
-NET_TEST bool IPNumberMatchesPrefix(const IPAddressNumber& ip_number,
-                                    const IPAddressNumber& ip_prefix,
-                                    size_t prefix_length_in_bits);
+NET_EXPORT_PRIVATE bool IPNumberMatchesPrefix(const IPAddressNumber& ip_number,
+                                              const IPAddressNumber& ip_prefix,
+                                              size_t prefix_length_in_bits);
 
 // Makes a copy of |info|. The dynamically-allocated parts are copied as well.
 // If |recursive| is true, chained entries via ai_next are copied too.
@@ -456,12 +459,13 @@ uint16 GetPortFromAddrinfo(const struct addrinfo* info);
 // Same except for struct sockaddr.
 const uint16* GetPortFieldFromSockaddr(const struct sockaddr* address,
                                        socklen_t address_len);
-NET_TEST int GetPortFromSockaddr(const struct sockaddr* address,
-                                 socklen_t address_len);
+NET_EXPORT_PRIVATE int GetPortFromSockaddr(const struct sockaddr* address,
+                                           socklen_t address_len);
 
 // Sets every addrinfo in the linked list |head| as having a port field of
 // |port|.
-NET_TEST void SetPortForAllAddrinfos(struct addrinfo* head, uint16 port);
+NET_EXPORT_PRIVATE void SetPortForAllAddrinfos(struct addrinfo* head,
+                                               uint16 port);
 
 // Returns true if |host| is one of the names (e.g. "localhost") or IP
 // addresses (IPv4 127.0.0.0/8 or IPv6 ::1) that indicate a loopback.
@@ -469,11 +473,11 @@ NET_TEST void SetPortForAllAddrinfos(struct addrinfo* head, uint16 port);
 // Note that this function does not check for IP addresses other than
 // the above, although other IP addresses may point to the local
 // machine.
-NET_TEST bool IsLocalhost(const std::string& host);
+NET_EXPORT_PRIVATE bool IsLocalhost(const std::string& host);
 
 // struct that is used by GetNetworkList() to represent a network
 // interface.
-struct NET_API NetworkInterface {
+struct NET_EXPORT NetworkInterface {
   NetworkInterface();
   NetworkInterface(const std::string& name, const IPAddressNumber& address);
   ~NetworkInterface();
@@ -488,7 +492,7 @@ typedef std::vector<NetworkInterface> NetworkInterfaceList;
 // interface has more than one address, a separate entry is added to
 // the list for each address.
 // Can be called only on a thread that allows IO.
-NET_API bool GetNetworkList(NetworkInterfaceList* networks);
+NET_EXPORT bool GetNetworkList(NetworkInterfaceList* networks);
 
 }  // namespace net
 
diff --git a/net/base/network_change_notifier.h b/net/base/network_change_notifier.h
index fe2a8f1..dad71c3 100644
--- a/net/base/network_change_notifier.h
+++ b/net/base/network_change_notifier.h
@@ -8,7 +8,7 @@
 
 #include "base/basictypes.h"
 #include "base/observer_list_threadsafe.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
@@ -17,9 +17,9 @@ class NetworkChangeNotifierFactory;
 // NetworkChangeNotifier monitors the system for network changes, and notifies
 // registered observers of those events.  Observers may register on any thread,
 // and will be called back on the thread from which they registered.
-class NET_API NetworkChangeNotifier {
+class NET_EXPORT NetworkChangeNotifier {
  public:
-  class NET_API IPAddressObserver {
+  class NET_EXPORT IPAddressObserver {
    public:
     virtual ~IPAddressObserver() {}
 
@@ -34,7 +34,7 @@ class NET_API NetworkChangeNotifier {
     DISALLOW_COPY_AND_ASSIGN(IPAddressObserver);
   };
 
-  class NET_API OnlineStateObserver {
+  class NET_EXPORT OnlineStateObserver {
    public:
     virtual ~OnlineStateObserver() {}
 
diff --git a/net/base/network_change_notifier_factory.h b/net/base/network_change_notifier_factory.h
index d4f3f8d..0812d55 100644
--- a/net/base/network_change_notifier_factory.h
+++ b/net/base/network_change_notifier_factory.h
@@ -6,14 +6,14 @@
 #define NET_BASE_NETWORK_CHANGE_NOTIFIER_FACTORY_H_
 #pragma once
 
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
 class NetworkChangeNotifier;
 // NetworkChangeNotifierFactory provides a mechanism for overriding the default
 // instance creation process of NetworkChangeNotifier.
-class NET_API NetworkChangeNotifierFactory {
+class NET_EXPORT NetworkChangeNotifierFactory {
  public:
   NetworkChangeNotifierFactory() {}
   virtual ~NetworkChangeNotifierFactory() {}
diff --git a/net/base/origin_bound_cert_service.h b/net/base/origin_bound_cert_service.h
index eaec93a..a194633 100644
--- a/net/base/origin_bound_cert_service.h
+++ b/net/base/origin_bound_cert_service.h
@@ -13,7 +13,7 @@
 #include "base/memory/scoped_ptr.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"
 
 namespace net {
 
@@ -24,7 +24,7 @@ class OriginBoundCertStore;
 // A class for creating and fetching origin bound certs.
 // Inherits from NonThreadSafe in order to use the function
 // |CalledOnValidThread|.
-class NET_API OriginBoundCertService
+class NET_EXPORT OriginBoundCertService
     : NON_EXPORTED_BASE(public base::NonThreadSafe) {
  public:
   // Opaque type used to cancel a request.
diff --git a/net/base/origin_bound_cert_store.h b/net/base/origin_bound_cert_store.h
index 9646c83..d818d48 100644
--- a/net/base/origin_bound_cert_store.h
+++ b/net/base/origin_bound_cert_store.h
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
@@ -19,7 +19,7 @@ namespace net {
 // Owned only by a single OriginBoundCertService object, which is responsible
 // for deleting it.
 
-class NET_API OriginBoundCertStore {
+class NET_EXPORT OriginBoundCertStore {
  public:
   virtual ~OriginBoundCertStore() {}
 
diff --git a/net/base/pem_tokenizer.h b/net/base/pem_tokenizer.h
index 30b2cda..9f239fc 100644
--- a/net/base/pem_tokenizer.h
+++ b/net/base/pem_tokenizer.h
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "base/string_piece.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
@@ -18,7 +18,7 @@ namespace net {
 // using RFC 1421, Privacy Enhancement for Internet Electronic Mail. It
 // does not implement the full specification, most notably it does not
 // support the Encapsulated Header Portion described in Section 4.4.
-class NET_TEST PEMTokenizer {
+class NET_EXPORT_PRIVATE PEMTokenizer {
  public:
   // Create a new PEMTokenizer that iterates through |str| searching for
   // instances of PEM encoded blocks that are of the |allowed_block_types|.
diff --git a/net/base/registry_controlled_domain.h b/net/base/registry_controlled_domain.h
index 49b176b..f11904b 100644
--- a/net/base/registry_controlled_domain.h
+++ b/net/base/registry_controlled_domain.h
@@ -114,7 +114,7 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 class GURL;
 
@@ -127,7 +127,7 @@ namespace net {
 struct RegistryControlledDomainServiceSingletonTraits;
 
 // This class is a singleton.
-class NET_API RegistryControlledDomainService {
+class NET_EXPORT RegistryControlledDomainService {
  public:
    ~RegistryControlledDomainService() { }
 
diff --git a/net/base/sdch_filter.h b/net/base/sdch_filter.h
index af04f03..7fa07ea 100644
--- a/net/base/sdch_filter.h
+++ b/net/base/sdch_filter.h
@@ -19,7 +19,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "net/base/filter.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/base/sdch_manager.h"
 
 namespace open_vcdiff {
@@ -28,7 +28,7 @@ class VCDiffStreamingDecoder;
 
 namespace net {
 
-class NET_TEST SdchFilter : public Filter {
+class NET_EXPORT_PRIVATE SdchFilter : public Filter {
  public:
   virtual ~SdchFilter();
 
diff --git a/net/base/sdch_manager.h b/net/base/sdch_manager.h
index ce23feb..c65dc20 100644
--- a/net/base/sdch_manager.h
+++ b/net/base/sdch_manager.h
@@ -30,7 +30,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
@@ -55,7 +55,7 @@ class SdchFetcher {
 
 //------------------------------------------------------------------------------
 
-class NET_API SdchManager {
+class NET_EXPORT SdchManager {
  public:
   // A list of errors that appeared and were either resolved, or used to turn
   // off sdch encoding.
@@ -162,7 +162,7 @@ class NET_API SdchManager {
 
   // There is one instance of |Dictionary| for each memory-cached SDCH
   // dictionary.
-  class NET_TEST Dictionary : public base::RefCounted<Dictionary> {
+  class NET_EXPORT_PRIVATE Dictionary : public base::RefCounted<Dictionary> {
    public:
     // Sdch filters can get our text to use in decoding compressed data.
     const std::string& text() const { return text_; }
diff --git a/net/base/single_request_host_resolver.h b/net/base/single_request_host_resolver.h
index 6b9ec9b..63f1a33 100644
--- a/net/base/single_request_host_resolver.h
+++ b/net/base/single_request_host_resolver.h
@@ -13,7 +13,7 @@ namespace net {
 // This class represents the task of resolving a hostname (or IP address
 // literal) to an AddressList object.  It wraps HostResolver to resolve only a
 // single hostname at a time and cancels this request when going out of scope.
-class NET_API SingleRequestHostResolver {
+class NET_EXPORT SingleRequestHostResolver {
  public:
   // |resolver| must remain valid for the lifetime of |this|.
   explicit SingleRequestHostResolver(HostResolver* resolver);
diff --git a/net/base/ssl_cert_request_info.h b/net/base/ssl_cert_request_info.h
index 584154e..1593160 100644
--- a/net/base/ssl_cert_request_info.h
+++ b/net/base/ssl_cert_request_info.h
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "base/memory/ref_counted.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
@@ -18,7 +18,7 @@ class X509Certificate;
 
 // The SSLCertRequestInfo class contains the info that allows a user to
 // select a certificate to send to the SSL server for client authentication.
-class NET_API SSLCertRequestInfo
+class NET_EXPORT SSLCertRequestInfo
     : public base::RefCountedThreadSafe<SSLCertRequestInfo> {
  public:
   SSLCertRequestInfo();
diff --git a/net/base/ssl_cipher_suite_names.h b/net/base/ssl_cipher_suite_names.h
index f97b17f..8d1f4d1 100644
--- a/net/base/ssl_cipher_suite_names.h
+++ b/net/base/ssl_cipher_suite_names.h
@@ -9,7 +9,7 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
@@ -19,22 +19,22 @@ namespace net {
 // wire and recorded at
 // http://www.iana.org/assignments/tls-parameters/tls-parameters.xml
 // If the cipher suite is unknown, the strings are set to "???".
-NET_API void SSLCipherSuiteToStrings(const char** key_exchange_str,
-                                     const char** cipher_str,
-                                     const char** mac_str,
-                                     uint16 cipher_suite);
+NET_EXPORT void SSLCipherSuiteToStrings(const char** key_exchange_str,
+                                        const char** cipher_str,
+                                        const char** mac_str,
+                                        uint16 cipher_suite);
 
 // SSLCompressionToString returns the name of the compression algorithm
 // specified by |compression_method|, which is the TLS compression id.
 // If the algorithm is unknown, |name| is set to "???".
-NET_API void SSLCompressionToString(const char** name,
-                                    uint8 compression_method);
+NET_EXPORT void SSLCompressionToString(const char** name,
+                                       uint8 compression_method);
 
 // SSLVersionToString returns the name of the SSL protocol version
 // specified by |ssl_version|, which is defined in
 // net/base/ssl_connection_status_flags.h.
 // If the version is unknown, |name| is set to "???".
-NET_API void SSLVersionToString(const char** name, int ssl_version);
+NET_EXPORT void SSLVersionToString(const char** name, int ssl_version);
 
 // Parses a string literal that represents a SSL/TLS cipher suite.
 //
@@ -48,8 +48,8 @@ NET_API void SSLVersionToString(const char** name, int ssl_version);
 //
 // TODO(rsleevi): Support the full strings defined in the IANA TLS parameters
 // list.
-NET_API bool ParseSSLCipherString(const std::string& cipher_string,
-                                  uint16* cipher_suite);
+NET_EXPORT bool ParseSSLCipherString(const std::string& cipher_string,
+                                     uint16* cipher_suite);
 
 }  // namespace net
 
diff --git a/net/base/ssl_client_auth_cache.h b/net/base/ssl_client_auth_cache.h
index 4321e22..56e99fe 100644
--- a/net/base/ssl_client_auth_cache.h
+++ b/net/base/ssl_client_auth_cache.h
@@ -11,7 +11,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "net/base/cert_database.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
@@ -24,7 +24,7 @@ class X509Certificate;
 //
 // TODO(wtc): This class is based on FtpAuthCache.  We can extract the common
 // code to a template class.
-class NET_TEST SSLClientAuthCache : public CertDatabase::Observer {
+class NET_EXPORT_PRIVATE SSLClientAuthCache : public CertDatabase::Observer {
  public:
   SSLClientAuthCache();
   virtual ~SSLClientAuthCache();
diff --git a/net/base/ssl_config_service.h b/net/base/ssl_config_service.h
index ab191e8..b5c4a54 100644
--- a/net/base/ssl_config_service.h
+++ b/net/base/ssl_config_service.h
@@ -12,13 +12,13 @@
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "base/string_piece.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/base/x509_certificate.h"
 
 namespace net {
 
 // A collection of SSL-related configuration settings.
-struct NET_API SSLConfig {
+struct NET_EXPORT SSLConfig {
   // Default to revocation checking.
   // Default to SSL 3.0 on and TLS 1.0 on.
   SSLConfig();
@@ -72,7 +72,7 @@ struct NET_API SSLConfig {
   // TODO(wtc): move the following members to a new SSLParams structure.  They
   // are not SSL configuration settings.
 
-  struct NET_API CertAndStatus {
+  struct NET_EXPORT CertAndStatus {
     CertAndStatus();
     ~CertAndStatus();
 
@@ -109,11 +109,11 @@ struct NET_API SSLConfig {
 // does not cover setting the SSL configuration, as on some systems, the
 // SSLConfigService objects may not have direct access to the configuration, or
 // live longer than the configuration preferences.
-class NET_API SSLConfigService
+class NET_EXPORT SSLConfigService
     : public base::RefCountedThreadSafe<SSLConfigService> {
  public:
   // Observer is notified when SSL config settings have changed.
-  class NET_API Observer {
+  class NET_EXPORT Observer {
    public:
     // Notify observers if SSL settings have changed.  We don't check all of the
     // data in SSLConfig, just those that qualify as a user config change.
diff --git a/net/base/ssl_config_service_defaults.h b/net/base/ssl_config_service_defaults.h
index 6e5eb1b..7312a18 100644
--- a/net/base/ssl_config_service_defaults.h
+++ b/net/base/ssl_config_service_defaults.h
@@ -6,7 +6,7 @@
 #define NET_BASE_SSL_CONFIG_SERVICE_DEFAULTS_H_
 #pragma once
 
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/base/ssl_config_service.h"
 
 namespace net {
@@ -14,7 +14,7 @@ namespace net {
 // This SSLConfigService always returns the default SSLConfig settings.  It is
 // mainly useful for unittests, or for platforms that do not have a native
 // implementation of SSLConfigService yet.
-class NET_API SSLConfigServiceDefaults : public SSLConfigService {
+class NET_EXPORT SSLConfigServiceDefaults : public SSLConfigService {
  public:
   SSLConfigServiceDefaults();
 
diff --git a/net/base/ssl_false_start_blacklist.h b/net/base/ssl_false_start_blacklist.h
index 1759630..3d31702 100644
--- a/net/base/ssl_false_start_blacklist.h
+++ b/net/base/ssl_false_start_blacklist.h
@@ -6,7 +6,7 @@
 #define NET_BASE_SSL_FALSE_START_BLACKLIST_H_
 
 #include "base/basictypes.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
@@ -18,7 +18,7 @@ class SSLFalseStartBlacklist {
  public:
   // IsMember returns true if the given host is in the blacklist.
   //   host: a DNS name in dotted form (i.e. "www.example.com")
-  NET_TEST static bool IsMember(const char* host);
+  NET_EXPORT_PRIVATE static bool IsMember(const char* host);
 
   // Hash returns the modified djb2 hash of the given string.
   static unsigned Hash(const char* str) {
diff --git a/net/base/ssl_info.h b/net/base/ssl_info.h
index 7b93465..9adc76d 100644
--- a/net/base/ssl_info.h
+++ b/net/base/ssl_info.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/memory/ref_counted.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/base/x509_cert_types.h"
 
 namespace net {
@@ -18,7 +18,7 @@ class X509Certificate;
 
 // SSL connection info.
 // This is really a struct.  All members are public.
-class NET_API SSLInfo {
+class NET_EXPORT SSLInfo {
  public:
   // HandshakeType enumerates the possible resumption cases after an SSL
   // handshake.
diff --git a/net/base/static_cookie_policy.h b/net/base/static_cookie_policy.h
index 99a929c..664c638cf 100644
--- a/net/base/static_cookie_policy.h
+++ b/net/base/static_cookie_policy.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/basictypes.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 class GURL;
 
@@ -15,7 +15,7 @@ namespace net {
 
 // The StaticCookiePolicy class implements a static cookie policy that supports
 // three modes: allow all, deny all, or block third-party cookies.
-class NET_API StaticCookiePolicy {
+class NET_EXPORT StaticCookiePolicy {
  public:
   // Do not change the order of these types as they are persisted in
   // preferences.
diff --git a/net/base/test_data_stream.h b/net/base/test_data_stream.h
index b92a9f3..1b4b0ba 100644
--- a/net/base/test_data_stream.h
+++ b/net/base/test_data_stream.h
@@ -8,14 +8,14 @@
 
 #include <string.h>  // for memcpy().
 #include <algorithm>
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 // This is a class for generating an infinite stream of data which can be
 // verified independently to be the correct stream of data.
 
 namespace net {
 
-class NET_API TestDataStream {
+class NET_EXPORT TestDataStream {
  public:
   TestDataStream();
 
diff --git a/net/base/test_root_certs.h b/net/base/test_root_certs.h
index 16864de..e2812a5 100644
--- a/net/base/test_root_certs.h
+++ b/net/base/test_root_certs.h
@@ -8,7 +8,7 @@
 
 #include "base/lazy_instance.h"
 #include "build/build_config.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
@@ -30,7 +30,7 @@ class X509Certificate;
 // TestRootCerts is a helper class for unit tests that is used to
 // artificially mark a certificate as trusted, independent of the local
 // machine configuration.
-class NET_TEST TestRootCerts {
+class NET_EXPORT_PRIVATE TestRootCerts {
  public:
   // Obtains the Singleton instance to the trusted certificates.
   static TestRootCerts* GetInstance();
diff --git a/net/base/transport_security_state.h b/net/base/transport_security_state.h
index a3f1462..805e2c4 100644
--- a/net/base/transport_security_state.h
+++ b/net/base/transport_security_state.h
@@ -14,7 +14,7 @@
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/time.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/base/x509_cert_types.h"
 
 namespace net {
@@ -24,7 +24,7 @@ namespace net {
 // Tracks which hosts have enabled *-Transport-Security. This object manages
 // the in-memory store. A separate object must register itself with this object
 // in order to persist the state to disk.
-class NET_API TransportSecurityState :
+class NET_EXPORT TransportSecurityState :
     public base::RefCountedThreadSafe<TransportSecurityState> {
  public:
   // If non-empty, |hsts_hosts| is a JSON-formatted string to treat as if it
@@ -33,7 +33,7 @@ class NET_API TransportSecurityState :
   explicit TransportSecurityState(const std::string& hsts_hosts);
 
   // A DomainState is the information that we persist about a given domain.
-  struct NET_API DomainState {
+  struct NET_EXPORT DomainState {
     enum Mode {
       // Strict mode implies:
       //   * We generate internal redirects from HTTP -> HTTPS.
diff --git a/net/base/upload_data.h b/net/base/upload_data.h
index 4945607..792d06b 100644
--- a/net/base/upload_data.h
+++ b/net/base/upload_data.h
@@ -14,7 +14,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
@@ -22,7 +22,7 @@ class FileStream;
 
 // Interface implemented by callers who require callbacks when new chunks
 // of data are added.
-class NET_TEST ChunkCallback {
+class NET_EXPORT_PRIVATE ChunkCallback {
  public:
   // Invoked when a new data chunk was given for a chunked transfer upload.
   virtual void OnChunkAvailable() = 0;
@@ -31,7 +31,7 @@ class NET_TEST ChunkCallback {
   virtual ~ChunkCallback() {}
 };
 
-class NET_API UploadData : public base::RefCounted<UploadData> {
+class NET_EXPORT UploadData : public base::RefCounted<UploadData> {
  public:
   enum Type {
     TYPE_BYTES,
@@ -43,7 +43,7 @@ class NET_API UploadData : public base::RefCounted<UploadData> {
     TYPE_CHUNK,
   };
 
-  class NET_API Element {
+  class NET_EXPORT Element {
    public:
     Element();
     ~Element();
diff --git a/net/base/upload_data_stream.h b/net/base/upload_data_stream.h
index c5a333d..df21e63 100644
--- a/net/base/upload_data_stream.h
+++ b/net/base/upload_data_stream.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"
 #include "net/base/upload_data.h"
 
 namespace net {
@@ -15,7 +15,7 @@ namespace net {
 class FileStream;
 class IOBuffer;
 
-class NET_API UploadDataStream {
+class NET_EXPORT UploadDataStream {
  public:
   ~UploadDataStream();
 
diff --git a/net/base/winsock_init.h b/net/base/winsock_init.h
index 034146e..acbbd3f 100644
--- a/net/base/winsock_init.h
+++ b/net/base/winsock_init.h
@@ -9,12 +9,12 @@
 #define NET_BASE_WINSOCK_INIT_H_
 #pragma once
 
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
 // Make sure that Winsock is initialized, calling WSAStartup if needed.
-NET_API void EnsureWinsockInit();
+NET_EXPORT void EnsureWinsockInit();
 
 }  // namespace net
 
diff --git a/net/base/x509_cert_types.h b/net/base/x509_cert_types.h
index 1343d92..ab91a8d 100644
--- a/net/base/x509_cert_types.h
+++ b/net/base/x509_cert_types.h
@@ -13,7 +13,7 @@
 #include <vector>
 
 #include "build/build_config.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 #if defined(OS_MACOSX)
 #include <Security/x509defs.h>
@@ -46,7 +46,7 @@ class SHA1FingerprintLessThan {
 };
 
 // CertPrincipal represents the issuer or subject field of an X.509 certificate.
-struct NET_API CertPrincipal {
+struct NET_EXPORT CertPrincipal {
   CertPrincipal();
   explicit CertPrincipal(const std::string& name);
   ~CertPrincipal();
@@ -85,7 +85,7 @@ struct NET_API CertPrincipal {
 
 // This class is useful for maintaining policies about which certificates are
 // permitted or forbidden for a particular purpose.
-class NET_API CertPolicy {
+class NET_EXPORT CertPolicy {
  public:
   // The judgments this policy can reach.
   enum Judgment {
diff --git a/net/base/x509_certificate.h b/net/base/x509_certificate.h
index 4ef8003..4c8dd01 100644
--- a/net/base/x509_certificate.h
+++ b/net/base/x509_certificate.h
@@ -15,7 +15,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/string_piece.h"
 #include "base/time.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/base/x509_cert_types.h"
 
 #if defined(OS_WIN)
@@ -52,7 +52,7 @@ typedef std::vector<scoped_refptr<X509Certificate> > CertificateList;
 // particular identity or end-entity certificate, such as an SSL server
 // identity or an SSL client certificate, and zero or more intermediate
 // certificates that may be used to build a path to a root certificate.
-class NET_API X509Certificate
+class NET_EXPORT X509Certificate
     : public base::RefCountedThreadSafe<X509Certificate> {
  public:
   // A handle to the certificate object in the underlying crypto library.
@@ -74,7 +74,7 @@ class NET_API X509Certificate
   typedef std::vector<OSCertHandle> OSCertHandles;
 
   // Predicate functor used in maps when X509Certificate is used as the key.
-  class NET_API LessThan {
+  class NET_EXPORT LessThan {
    public:
     bool operator() (X509Certificate* lhs,  X509Certificate* rhs) const;
   };
diff --git a/net/disk_cache/addr.h b/net/disk_cache/addr.h
index cd4dc63..aa81a16 100644
--- a/net/disk_cache/addr.h
+++ b/net/disk_cache/addr.h
@@ -9,7 +9,7 @@
 #define NET_DISK_CACHE_ADDR_H_
 #pragma once
 
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/disk_cache/disk_format.h"
 
 namespace disk_cache {
@@ -48,7 +48,7 @@ const int kFirstAdditionalBlockFile = 4;
 //   0000 0011 0000 0000 0000 0000 0000 0000 : number of contiguous blocks 1-4
 //   0000 0000 1111 1111 0000 0000 0000 0000 : file selector 0 - 255
 //   0000 0000 0000 0000 1111 1111 1111 1111 : block#  0 - 65,535 (2^16)
-class NET_TEST Addr {
+class NET_EXPORT_PRIVATE Addr {
  public:
   Addr() : value_(0) {}
   explicit Addr(CacheAddr address) : value_(address) {}
diff --git a/net/disk_cache/backend_impl.h b/net/disk_cache/backend_impl.h
index 1ead317..5344c8d 100644
--- a/net/disk_cache/backend_impl.h
+++ b/net/disk_cache/backend_impl.h
@@ -39,7 +39,7 @@ enum BackendFlags {
 
 // This class implements the Backend interface. An object of this
 // class handles the operations of the cache for a particular profile.
-class NET_TEST BackendImpl : public Backend {
+class NET_EXPORT_PRIVATE BackendImpl : public Backend {
   friend class Eviction;
  public:
   BackendImpl(const FilePath& path, base::MessageLoopProxy* cache_thread,
@@ -383,7 +383,7 @@ class NET_TEST BackendImpl : public Backend {
 };
 
 // Returns the prefered max cache size given the available disk space.
-NET_TEST int PreferedCacheSize(int64 available);
+NET_EXPORT_PRIVATE int PreferedCacheSize(int64 available);
 
 }  // namespace disk_cache
 
diff --git a/net/disk_cache/bitmap.h b/net/disk_cache/bitmap.h
index 23e392f..0ac204b 100644
--- a/net/disk_cache/bitmap.h
+++ b/net/disk_cache/bitmap.h
@@ -7,12 +7,12 @@
 #pragma once
 
 #include "base/basictypes.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace disk_cache {
 
 // This class provides support for simple maps of bits.
-class NET_TEST Bitmap {
+class NET_EXPORT_PRIVATE Bitmap {
  public:
   Bitmap() : map_(NULL), num_bits_(0), array_size_(0), alloc_(false) {}
 
diff --git a/net/disk_cache/block_files.h b/net/disk_cache/block_files.h
index 5ba49c5..435eed7 100644
--- a/net/disk_cache/block_files.h
+++ b/net/disk_cache/block_files.h
@@ -13,7 +13,7 @@
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/disk_cache/addr.h"
 #include "net/disk_cache/mapped_file.h"
 
@@ -24,7 +24,7 @@ class ThreadChecker;
 namespace disk_cache {
 
 // This class handles the set of block-files open by the disk cache.
-class NET_TEST BlockFiles {
+class NET_EXPORT_PRIVATE BlockFiles {
  public:
   explicit BlockFiles(const FilePath& path);
   ~BlockFiles();
diff --git a/net/disk_cache/cache_util.h b/net/disk_cache/cache_util.h
index 47630b9..108f0b7 100644
--- a/net/disk_cache/cache_util.h
+++ b/net/disk_cache/cache_util.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/basictypes.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 class FilePath;
 
@@ -19,14 +19,15 @@ namespace disk_cache {
 // for the cache directory.  Returns true if successful.  On ChromeOS,
 // this moves the cache contents, and leaves the empty cache
 // directory.
-NET_TEST bool MoveCache(const FilePath& from_path, const FilePath& to_path);
+NET_EXPORT_PRIVATE bool MoveCache(const FilePath& from_path,
+                                  const FilePath& to_path);
 
 // Deletes the cache files stored on |path|, and optionally also attempts to
 // delete the folder itself.
-NET_TEST void DeleteCache(const FilePath& path, bool remove_folder);
+NET_EXPORT_PRIVATE void DeleteCache(const FilePath& path, bool remove_folder);
 
 // Deletes a cache file.
-NET_TEST bool DeleteCacheFile(const FilePath& name);
+NET_EXPORT_PRIVATE bool DeleteCacheFile(const FilePath& name);
 
 }  // namespace disk_cache
 
diff --git a/net/disk_cache/disk_cache.h b/net/disk_cache/disk_cache.h
index dc320cc..516edb5 100644
--- a/net/disk_cache/disk_cache.h
+++ b/net/disk_cache/disk_cache.h
@@ -14,9 +14,9 @@
 
 #include "base/basictypes.h"
 #include "base/time.h"
-#include "net/base/net_api.h"
 #include "net/base/cache_type.h"
 #include "net/base/completion_callback.h"
+#include "net/base/net_export.h"
 
 class FilePath;
 
@@ -50,14 +50,14 @@ typedef net::CompletionCallback CompletionCallback;
 // be invoked when a backend is available or a fatal error condition is reached.
 // The pointer to receive the |backend| must remain valid until the operation
 // completes (the callback is notified).
-NET_API int CreateCacheBackend(net::CacheType type, const FilePath& path,
-                               int max_bytes, bool force,
-                               base::MessageLoopProxy* thread,
-                               net::NetLog* net_log, Backend** backend,
-                               CompletionCallback* callback);
+NET_EXPORT int CreateCacheBackend(net::CacheType type, const FilePath& path,
+                                  int max_bytes, bool force,
+                                  base::MessageLoopProxy* thread,
+                                  net::NetLog* net_log, Backend** backend,
+                                  CompletionCallback* callback);
 
 // The root interface for a disk cache instance.
-class NET_API Backend {
+class NET_EXPORT Backend {
  public:
   // If the backend is destroyed when there are operations in progress (any
   // callback that has not been invoked yet), this method cancels said
@@ -144,7 +144,7 @@ class NET_API Backend {
 };
 
 // This interface represents an entry in the disk cache.
-class NET_TEST Entry {
+class NET_EXPORT Entry {
  public:
   // Marks this cache entry for deletion.
   virtual void Doom() = 0;
diff --git a/net/disk_cache/disk_format.h b/net/disk_cache/disk_format.h
index 661e4c8..fd36d34 100644
--- a/net/disk_cache/disk_format.h
+++ b/net/disk_cache/disk_format.h
@@ -57,7 +57,7 @@
 #pragma once
 
 #include "base/basictypes.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace disk_cache {
 
@@ -80,7 +80,7 @@ struct LruData {
 };
 
 // Header for the master index file.
-struct NET_TEST IndexHeader {
+struct NET_EXPORT_PRIVATE IndexHeader {
   IndexHeader();
 
   uint32      magic;
@@ -174,7 +174,7 @@ typedef uint32 AllocBitmap[kMaxBlocks / 32];
 // where did we find the last entry of that type (to avoid searching the bitmap
 // from the beginning every time).
 // This Structure is the header of a block-file:
-struct NET_TEST BlockFileHeader {
+struct NET_EXPORT_PRIVATE BlockFileHeader {
   BlockFileHeader();
 
   uint32          magic;
diff --git a/net/disk_cache/entry_impl.h b/net/disk_cache/entry_impl.h
index d54c306..d82c74d 100644
--- a/net/disk_cache/entry_impl.h
+++ b/net/disk_cache/entry_impl.h
@@ -19,7 +19,9 @@ class SparseControl;
 
 // This class implements the Entry interface. An object of this
 // class represents a single entry on the cache.
-class NET_TEST EntryImpl : public Entry, public base::RefCounted<EntryImpl> {
+class NET_EXPORT_PRIVATE EntryImpl
+    : public Entry,
+      public base::RefCounted<EntryImpl> {
   friend class base::RefCounted<EntryImpl>;
   friend class SparseControl;
  public:
diff --git a/net/disk_cache/file.h b/net/disk_cache/file.h
index fcc3ce8..dc50133 100644
--- a/net/disk_cache/file.h
+++ b/net/disk_cache/file.h
@@ -10,7 +10,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/platform_file.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 class FilePath;
 
@@ -27,7 +27,7 @@ class FileIOCallback {
 };
 
 // Simple wrapper around a file that allows asynchronous operations.
-class NET_TEST File : public base::RefCounted<File> {
+class NET_EXPORT_PRIVATE File : public base::RefCounted<File> {
   friend class base::RefCounted<File>;
  public:
   File();
diff --git a/net/disk_cache/file_lock.h b/net/disk_cache/file_lock.h
index 9823292..ad8e539 100644
--- a/net/disk_cache/file_lock.h
+++ b/net/disk_cache/file_lock.h
@@ -8,7 +8,7 @@
 #define NET_DISK_CACHE_FILE_LOCK_H__
 #pragma once
 
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/disk_cache/disk_format.h"
 
 namespace disk_cache {
@@ -28,7 +28,7 @@ namespace disk_cache {
 // because otherwise the desired effect of the "lock" will not be achieved. If
 // the operations are inlined / optimized, the "locked" operations can happen
 // outside the lock.
-class NET_TEST FileLock {
+class NET_EXPORT_PRIVATE FileLock {
  public:
   explicit FileLock(BlockFileHeader* header);
   virtual ~FileLock();
diff --git a/net/disk_cache/hash.h b/net/disk_cache/hash.h
index 4517653..4bcf270 100644
--- a/net/disk_cache/hash.h
+++ b/net/disk_cache/hash.h
@@ -9,13 +9,13 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace disk_cache {
 
 // From http://www.azillionmonkeys.com/qed/hash.html
 // This is the hash used on WebCore/platform/stringhash
-NET_TEST uint32 SuperFastHash(const char * data, int len);
+NET_EXPORT_PRIVATE uint32 SuperFastHash(const char * data, int len);
 
 inline uint32 Hash(const char* key, size_t length) {
   return SuperFastHash(key, static_cast<int>(length));
diff --git a/net/disk_cache/mapped_file.h b/net/disk_cache/mapped_file.h
index 24208cb..7886ad7 100644
--- a/net/disk_cache/mapped_file.h
+++ b/net/disk_cache/mapped_file.h
@@ -8,7 +8,7 @@
 #define NET_DISK_CACHE_MAPPED_FILE_H_
 #pragma once
 
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/disk_cache/disk_format.h"
 #include "net/disk_cache/file.h"
 #include "net/disk_cache/file_block.h"
@@ -21,7 +21,7 @@ namespace disk_cache {
 // idea is that the header and bitmap will be memory mapped all the time, and
 // the actual data for the blocks will be access asynchronously (most of the
 // time).
-class NET_TEST MappedFile : public File {
+class NET_EXPORT_PRIVATE MappedFile : public File {
  public:
   MappedFile() : File(true), init_(false) {}
 
diff --git a/net/disk_cache/mem_backend_impl.h b/net/disk_cache/mem_backend_impl.h
index 26a2556..68e4508 100644
--- a/net/disk_cache/mem_backend_impl.h
+++ b/net/disk_cache/mem_backend_impl.h
@@ -23,7 +23,7 @@ class MemEntryImpl;
 
 // This class implements the Backend interface. An object of this class handles
 // the operations of the cache without writing to disk.
-class NET_TEST MemBackendImpl : public Backend {
+class NET_EXPORT_PRIVATE MemBackendImpl : public Backend {
  public:
   explicit MemBackendImpl(net::NetLog* net_log);
   virtual ~MemBackendImpl();
diff --git a/net/disk_cache/rankings.cc b/net/disk_cache/rankings.cc
index b32984c..8198186 100644
--- a/net/disk_cache/rankings.cc
+++ b/net/disk_cache/rankings.cc
@@ -15,7 +15,7 @@ using base::TimeTicks;
 
 namespace disk_cache {
 // This is used by crash_cache.exe to generate unit test files.
-NET_TEST RankCrashes g_rankings_crash = NO_CRASH;
+NET_EXPORT_PRIVATE RankCrashes g_rankings_crash = NO_CRASH;
 }
 
 namespace {
diff --git a/net/disk_cache/trace.h b/net/disk_cache/trace.h
index f1996dd..99a35bd 100644
--- a/net/disk_cache/trace.h
+++ b/net/disk_cache/trace.h
@@ -12,7 +12,7 @@
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace disk_cache {
 
@@ -34,7 +34,7 @@ class TraceObject : public base::RefCounted<TraceObject> {
 };
 
 // Traces to the internal buffer.
-NET_TEST void Trace(const char* format, ...);
+NET_EXPORT_PRIVATE void Trace(const char* format, ...);
 
 }  // namespace disk_cache
 
diff --git a/net/dns/async_host_resolver.h b/net/dns/async_host_resolver.h
index ddefbaf..aecc403 100644
--- a/net/dns/async_host_resolver.h
+++ b/net/dns/async_host_resolver.h
@@ -24,7 +24,7 @@ namespace net {
 class AddressesList;
 class ClientSocketFactory;
 
-class NET_API AsyncHostResolver
+class NET_EXPORT AsyncHostResolver
     : public HostResolver,
       public DnsTransaction::Delegate,
       NON_EXPORTED_BASE(public base::NonThreadSafe) {
diff --git a/net/dns/dns_query.h b/net/dns/dns_query.h
index 2628063..c6bd3bc 100644
--- a/net/dns/dns_query.h
+++ b/net/dns/dns_query.h
@@ -9,7 +9,7 @@
 #include <string>
 
 #include "base/memory/ref_counted.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/base/rand_callback.h"
 
 namespace net {
@@ -17,7 +17,7 @@ namespace net {
 class IOBufferWithSize;
 
 // Represents on-the-wire DNS query message as an object.
-class NET_TEST DnsQuery {
+class NET_EXPORT_PRIVATE DnsQuery {
  public:
   // Constructs a query message from |qname| which *MUST* be in a valid
   // DNS name format, and |qtype| which must be either kDNS_A or kDNS_AAAA.
diff --git a/net/dns/dns_response.h b/net/dns/dns_response.h
index 04a37d6..cc7c3f7 100644
--- a/net/dns/dns_response.h
+++ b/net/dns/dns_response.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"
 #include "net/base/net_util.h"
 
 namespace net{
@@ -17,7 +17,7 @@ class IOBufferWithSize;
 
 // Represents on-the-wire DNS response as an object; allows extracting
 // records.
-class NET_TEST DnsResponse {
+class NET_EXPORT_PRIVATE DnsResponse {
  public:
   // Constructs an object with an IOBuffer large enough to read
   // one byte more than largest possible response, to detect malformed
diff --git a/net/dns/dns_transaction.h b/net/dns/dns_transaction.h
index eb09ece..94fd95d 100644
--- a/net/dns/dns_transaction.h
+++ b/net/dns/dns_transaction.h
@@ -17,7 +17,7 @@
 #include "base/threading/non_thread_safe.h"
 #include "net/base/completion_callback.h"
 #include "net/base/ip_endpoint.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/base/net_log.h"
 #include "net/base/rand_callback.h"
 
@@ -31,14 +31,15 @@ class DnsResponse;
 // Performs (with fixed retries) a single asynchronous DNS transaction,
 // which consists of sending out a DNS query, waiting for response, and
 // parsing and returning the IP addresses that it matches.
-class NET_TEST DnsTransaction : NON_EXPORTED_BASE(public base::NonThreadSafe) {
+class NET_EXPORT_PRIVATE DnsTransaction :
+    NON_EXPORTED_BASE(public base::NonThreadSafe) {
  public:
   typedef std::pair<std::string, uint16> Key;
 
   // Interface that should implemented by DnsTransaction consumer and
   // passed to |Start| method to be notified when the transaction has
   // completed.
-  class NET_TEST Delegate {
+  class NET_EXPORT_PRIVATE Delegate {
    public:
     Delegate();
     virtual ~Delegate();
diff --git a/net/ftp/ftp_auth_cache.h b/net/ftp/ftp_auth_cache.h
index 1ed83f0..6281f9d 100644
--- a/net/ftp/ftp_auth_cache.h
+++ b/net/ftp/ftp_auth_cache.h
@@ -10,7 +10,7 @@
 
 #include "base/string16.h"
 #include "googleurl/src/gurl.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
@@ -22,7 +22,7 @@ namespace net {
 //   GURL("ftp://myserver") -- OK (implied port of 21)
 //   GURL("ftp://myserver:21") -- OK
 //   GURL("ftp://myserver/PATH") -- WRONG, paths not allowed
-class NET_TEST FtpAuthCache {
+class NET_EXPORT_PRIVATE FtpAuthCache {
  public:
   // Maximum number of entries we allow in the cache.
   static const size_t kMaxEntries;
diff --git a/net/ftp/ftp_ctrl_response_buffer.h b/net/ftp/ftp_ctrl_response_buffer.h
index 031a666..c2224bb 100644
--- a/net/ftp/ftp_ctrl_response_buffer.h
+++ b/net/ftp/ftp_ctrl_response_buffer.h
@@ -12,11 +12,11 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
-struct NET_TEST FtpCtrlResponse {
+struct NET_EXPORT_PRIVATE FtpCtrlResponse {
   static const int kInvalidStatusCode;
 
   FtpCtrlResponse();
@@ -26,7 +26,7 @@ struct NET_TEST FtpCtrlResponse {
   std::vector<std::string> lines;  // Response lines, without CRLFs.
 };
 
-class NET_TEST FtpCtrlResponseBuffer {
+class NET_EXPORT_PRIVATE FtpCtrlResponseBuffer {
  public:
   FtpCtrlResponseBuffer();
   ~FtpCtrlResponseBuffer();
diff --git a/net/ftp/ftp_directory_listing_parser.h b/net/ftp/ftp_directory_listing_parser.h
index c0292ea..7e43dc8 100644
--- a/net/ftp/ftp_directory_listing_parser.h
+++ b/net/ftp/ftp_directory_listing_parser.h
@@ -12,7 +12,7 @@
 #include "base/basictypes.h"
 #include "base/string16.h"
 #include "base/time.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
@@ -37,7 +37,7 @@ struct FtpDirectoryListingEntry {
 
 // Parses an FTP directory listing |text|. On success fills in |entries|.
 // Returns network error code.
-NET_API int ParseFtpDirectoryListing(
+NET_EXPORT int ParseFtpDirectoryListing(
     const std::string& text,
     const base::Time& current_time,
     std::vector<FtpDirectoryListingEntry>* entries);
diff --git a/net/ftp/ftp_directory_listing_parser_ls.h b/net/ftp/ftp_directory_listing_parser_ls.h
index 5eeeeae..a690d63 100644
--- a/net/ftp/ftp_directory_listing_parser_ls.h
+++ b/net/ftp/ftp_directory_listing_parser_ls.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/string16.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace base {
 class Time;
@@ -20,7 +20,7 @@ namespace net {
 struct FtpDirectoryListingEntry;
 
 // Parses "ls -l" FTP directory listing. Returns true on success.
-NET_TEST bool ParseFtpDirectoryListingLs(
+NET_EXPORT_PRIVATE bool ParseFtpDirectoryListingLs(
     const std::vector<string16>& lines,
     const base::Time& current_time,
     std::vector<FtpDirectoryListingEntry>* entries);
diff --git a/net/ftp/ftp_directory_listing_parser_netware.h b/net/ftp/ftp_directory_listing_parser_netware.h
index 6e504e7..b6c8078 100644
--- a/net/ftp/ftp_directory_listing_parser_netware.h
+++ b/net/ftp/ftp_directory_listing_parser_netware.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/string16.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace base {
 class Time;
@@ -20,7 +20,7 @@ namespace net {
 struct FtpDirectoryListingEntry;
 
 // Parses Netware FTP directory listing. Returns true on success.
-NET_TEST bool ParseFtpDirectoryListingNetware(
+NET_EXPORT_PRIVATE bool ParseFtpDirectoryListingNetware(
     const std::vector<string16>& lines,
     const base::Time& current_time,
     std::vector<FtpDirectoryListingEntry>* entries);
diff --git a/net/ftp/ftp_directory_listing_parser_os2.h b/net/ftp/ftp_directory_listing_parser_os2.h
index 356b5b7..808343e 100644
--- a/net/ftp/ftp_directory_listing_parser_os2.h
+++ b/net/ftp/ftp_directory_listing_parser_os2.h
@@ -9,14 +9,14 @@
 #include <vector>
 
 #include "base/string16.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
 struct FtpDirectoryListingEntry;
 
 // Parses OS/2 FTP directory listing. Returns true on success.
-NET_TEST bool ParseFtpDirectoryListingOS2(
+NET_EXPORT_PRIVATE bool ParseFtpDirectoryListingOS2(
     const std::vector<string16>& lines,
     std::vector<FtpDirectoryListingEntry>* entries);
 
diff --git a/net/ftp/ftp_directory_listing_parser_vms.h b/net/ftp/ftp_directory_listing_parser_vms.h
index 59bcc12..64df7df 100644
--- a/net/ftp/ftp_directory_listing_parser_vms.h
+++ b/net/ftp/ftp_directory_listing_parser_vms.h
@@ -9,14 +9,14 @@
 #include <vector>
 
 #include "base/string16.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
 struct FtpDirectoryListingEntry;
 
 // Parses VMS FTP directory listing. Returns true on success.
-NET_TEST bool ParseFtpDirectoryListingVms(
+NET_EXPORT_PRIVATE bool ParseFtpDirectoryListingVms(
     const std::vector<string16>& lines,
     std::vector<FtpDirectoryListingEntry>* entries);
 
diff --git a/net/ftp/ftp_directory_listing_parser_windows.h b/net/ftp/ftp_directory_listing_parser_windows.h
index a77e5da..81cec7f 100644
--- a/net/ftp/ftp_directory_listing_parser_windows.h
+++ b/net/ftp/ftp_directory_listing_parser_windows.h
@@ -9,14 +9,14 @@
 #include <vector>
 
 #include "base/string16.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
 struct FtpDirectoryListingEntry;
 
 // Parses Windows FTP directory listing. Returns true on success.
-NET_TEST bool ParseFtpDirectoryListingWindows(
+NET_EXPORT_PRIVATE bool ParseFtpDirectoryListingWindows(
     const std::vector<string16>& lines,
     std::vector<FtpDirectoryListingEntry>* entries);
 
diff --git a/net/ftp/ftp_network_layer.h b/net/ftp/ftp_network_layer.h
index 2bc8511..d4bfe46 100644
--- a/net/ftp/ftp_network_layer.h
+++ b/net/ftp/ftp_network_layer.h
@@ -8,7 +8,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/ftp/ftp_transaction_factory.h"
 
 namespace net {
@@ -16,7 +16,7 @@ namespace net {
 class FtpNetworkSession;
 class HostResolver;
 
-class NET_API FtpNetworkLayer : public FtpTransactionFactory {
+class NET_EXPORT FtpNetworkLayer : public FtpTransactionFactory {
  public:
   explicit FtpNetworkLayer(HostResolver* host_resolver);
   virtual ~FtpNetworkLayer();
diff --git a/net/ftp/ftp_network_session.h b/net/ftp/ftp_network_session.h
index b39151c..ad1178a 100644
--- a/net/ftp/ftp_network_session.h
+++ b/net/ftp/ftp_network_session.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"
 #include "net/ftp/ftp_auth_cache.h"
 
 namespace net {
@@ -15,7 +15,8 @@ namespace net {
 class HostResolver;
 
 // This class holds session objects used by FtpNetworkTransaction objects.
-class NET_TEST FtpNetworkSession : public base::RefCounted<FtpNetworkSession> {
+class NET_EXPORT_PRIVATE FtpNetworkSession
+    : public base::RefCounted<FtpNetworkSession> {
  public:
   explicit FtpNetworkSession(HostResolver* host_resolver);
 
diff --git a/net/ftp/ftp_network_transaction.h b/net/ftp/ftp_network_transaction.h
index 459d5b1..c47c65f 100644
--- a/net/ftp/ftp_network_transaction.h
+++ b/net/ftp/ftp_network_transaction.h
@@ -27,7 +27,7 @@ class ClientSocketFactory;
 class FtpNetworkSession;
 class StreamSocket;
 
-class NET_TEST FtpNetworkTransaction : public FtpTransaction {
+class NET_EXPORT_PRIVATE FtpNetworkTransaction : public FtpTransaction {
  public:
   FtpNetworkTransaction(FtpNetworkSession* session,
                         ClientSocketFactory* socket_factory);
diff --git a/net/ftp/ftp_transaction.h b/net/ftp/ftp_transaction.h
index a3a6a12..2d1c5d8 100644
--- a/net/ftp/ftp_transaction.h
+++ b/net/ftp/ftp_transaction.h
@@ -10,7 +10,7 @@
 #include "net/base/completion_callback.h"
 #include "net/base/io_buffer.h"
 #include "net/base/load_states.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
@@ -19,7 +19,7 @@ class FtpRequestInfo;
 class BoundNetLog;
 
 // Represents a single FTP transaction.
-class NET_TEST FtpTransaction {
+class NET_EXPORT_PRIVATE FtpTransaction {
  public:
   // Stops any pending IO and destroys the transaction object.
   virtual ~FtpTransaction() {}
diff --git a/net/ftp/ftp_transaction_factory.h b/net/ftp/ftp_transaction_factory.h
index 30ec14d..9e53c70 100644
--- a/net/ftp/ftp_transaction_factory.h
+++ b/net/ftp/ftp_transaction_factory.h
@@ -6,14 +6,14 @@
 #define NET_FTP_FTP_TRANSACTION_FACTORY_H_
 #pragma once
 
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
 class FtpTransaction;
 
 // An interface to a class that can create FtpTransaction objects.
-class NET_API FtpTransactionFactory {
+class NET_EXPORT FtpTransactionFactory {
  public:
   virtual ~FtpTransactionFactory() {}
 
diff --git a/net/ftp/ftp_util.h b/net/ftp/ftp_util.h
index d4fa499..d0250f0 100644
--- a/net/ftp/ftp_util.h
+++ b/net/ftp/ftp_util.h
@@ -9,7 +9,7 @@
 #include <string>
 
 #include "base/string16.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace base {
 class Time;
@@ -17,7 +17,7 @@ class Time;
 
 namespace net {
 
-class NET_TEST FtpUtil {
+class NET_EXPORT_PRIVATE FtpUtil {
  public:
   // Converts Unix file path to VMS path (must be a file, and not a directory).
   static std::string UnixFilePathToVMS(const std::string& unix_path);
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() {}
diff --git a/net/net.gyp b/net/net.gyp
index 9a65bf7..bdc568d 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -128,12 +128,12 @@
         'base/mime_sniffer.h',
         'base/mime_util.cc',
         'base/mime_util.h',
-        'base/net_api.h',
         'base/net_error_list.h',
         'base/net_errors.cc',
         'base/net_errors.h',
         'base/net_errors_posix.cc',
         'base/net_errors_win.cc',
+        'base/net_export.h',
         'base/net_log.cc',
         'base/net_log.h',
         'base/net_log_event_type_list.h',
diff --git a/net/ocsp/nss_ocsp.h b/net/ocsp/nss_ocsp.h
index 4499a373..bf67751 100644
--- a/net/ocsp/nss_ocsp.h
+++ b/net/ocsp/nss_ocsp.h
@@ -6,7 +6,7 @@
 #define NET_OCSP_NSS_OCSP_H_
 #pragma once
 
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
@@ -15,19 +15,19 @@ class URLRequestContext;
 // Sets the MessageLoop for OCSP to the current message loop.
 // This should be called before EnsureOCSPInit() if you want to
 // control the message loop for OCSP.
-NET_API void SetMessageLoopForOCSP();
+NET_EXPORT void SetMessageLoopForOCSP();
 
 // Initializes OCSP handlers for NSS.  This must be called before any
 // certificate verification functions.  This function is thread-safe, and OCSP
 // handlers will only ever be initialized once.  ShutdownOCSP() must be called
 // on shutdown.
-NET_API void EnsureOCSPInit();
+NET_EXPORT void EnsureOCSPInit();
 
 // This should be called once on shutdown to stop issuing URLRequests for OCSP.
-NET_API void ShutdownOCSP();
+NET_EXPORT void ShutdownOCSP();
 
 // Set URLRequestContext for OCSP handlers.
-NET_API void SetURLRequestContextForOCSP(URLRequestContext* request_context);
+NET_EXPORT void SetURLRequestContextForOCSP(URLRequestContext* request_context);
 
 }  // namespace net
 
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);
diff --git a/net/socket/client_socket_factory.h b/net/socket/client_socket_factory.h
index c2e0350..b8e8d65 100644
--- a/net/socket/client_socket_factory.h
+++ b/net/socket/client_socket_factory.h
@@ -9,7 +9,7 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/base/net_log.h"
 #include "net/base/rand_callback.h"
 #include "net/udp/datagram_socket.h"
@@ -30,7 +30,7 @@ class StreamSocket;
 
 // An interface used to instantiate StreamSocket objects.  Used to facilitate
 // testing code with mock socket implementations.
-class NET_API ClientSocketFactory {
+class NET_EXPORT ClientSocketFactory {
  public:
   virtual ~ClientSocketFactory() {}
 
diff --git a/net/socket/client_socket_handle.h b/net/socket/client_socket_handle.h
index c5b94dc..3f75ccb 100644
--- a/net/socket/client_socket_handle.h
+++ b/net/socket/client_socket_handle.h
@@ -15,7 +15,7 @@
 #include "net/base/completion_callback.h"
 #include "net/base/load_states.h"
 #include "net/base/net_errors.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/base/net_log.h"
 #include "net/base/request_priority.h"
 #include "net/http/http_response_info.h"
@@ -30,7 +30,7 @@ namespace net {
 // connection.  It is used by the ClientSocketPool to group similar connected
 // client socket objects.
 //
-class NET_API ClientSocketHandle {
+class NET_EXPORT ClientSocketHandle {
  public:
   enum SocketReuseType {
     UNUSED = 0,   // unused socket that just finished connecting
diff --git a/net/socket/client_socket_pool.h b/net/socket/client_socket_pool.h
index c50af84..0c6b8a4 100644
--- a/net/socket/client_socket_pool.h
+++ b/net/socket/client_socket_pool.h
@@ -16,7 +16,7 @@
 #include "net/base/completion_callback.h"
 #include "net/base/host_resolver.h"
 #include "net/base/load_states.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/base/request_priority.h"
 
 namespace base {
@@ -32,7 +32,7 @@ class StreamSocket;
 // A ClientSocketPool is used to restrict the number of sockets open at a time.
 // It also maintains a list of idle persistent sockets.
 //
-class NET_API ClientSocketPool {
+class NET_EXPORT ClientSocketPool {
  public:
   // Requests a connected socket for a group_name.
   //
diff --git a/net/socket/client_socket_pool_base.h b/net/socket/client_socket_pool_base.h
index dd73f8b..3ccf5bd 100644
--- a/net/socket/client_socket_pool_base.h
+++ b/net/socket/client_socket_pool_base.h
@@ -38,8 +38,8 @@
 #include "net/base/address_list.h"
 #include "net/base/completion_callback.h"
 #include "net/base/load_states.h"
-#include "net/base/net_api.h"
 #include "net/base/net_errors.h"
+#include "net/base/net_export.h"
 #include "net/base/net_log.h"
 #include "net/base/network_change_notifier.h"
 #include "net/base/request_priority.h"
@@ -51,18 +51,18 @@ namespace net {
 class ClientSocketHandle;
 
 // Returns the client socket reuse policy.
-NET_TEST int GetSocketReusePolicy();
+NET_EXPORT_PRIVATE int GetSocketReusePolicy();
 
 // Sets the client socket reuse policy.
 // NOTE: 'policy' should be a valid ClientSocketReusePolicy enum value.
-NET_API void SetSocketReusePolicy(int policy);
+NET_EXPORT void SetSocketReusePolicy(int policy);
 
 // ConnectJob provides an abstract interface for "connecting" a socket.
 // The connection may involve host resolution, tcp connection, ssl connection,
 // etc.
-class NET_TEST ConnectJob {
+class NET_EXPORT_PRIVATE ConnectJob {
  public:
-  class NET_TEST Delegate {
+  class NET_EXPORT_PRIVATE Delegate {
    public:
     Delegate() {}
     virtual ~Delegate() {}
@@ -162,7 +162,7 @@ namespace internal {
 // ClientSocketPoolBase adds templated definitions built on top of
 // ClientSocketPoolBaseHelper.  This class is not for external use, please use
 // ClientSocketPoolBase instead.
-class NET_TEST ClientSocketPoolBaseHelper
+class NET_EXPORT_PRIVATE ClientSocketPoolBaseHelper
     : public ConnectJob::Delegate,
       public NetworkChangeNotifier::IPAddressObserver {
  public:
@@ -185,7 +185,7 @@ class NET_TEST ClientSocketPoolBaseHelper
     USE_LAST_ACCESSED_SOCKET = 2,
   };
 
-  class NET_TEST Request {
+  class NET_EXPORT_PRIVATE Request {
    public:
     Request(ClientSocketHandle* handle,
             CompletionCallback* callback,
diff --git a/net/socket/client_socket_pool_histograms.h b/net/socket/client_socket_pool_histograms.h
index a529d41..352ee48 100644
--- a/net/socket/client_socket_pool_histograms.h
+++ b/net/socket/client_socket_pool_histograms.h
@@ -10,7 +10,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/time.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace base {
 class Histogram;
@@ -18,7 +18,7 @@ class Histogram;
 
 namespace net {
 
-class NET_TEST ClientSocketPoolHistograms {
+class NET_EXPORT_PRIVATE ClientSocketPoolHistograms {
  public:
   ClientSocketPoolHistograms(const std::string& pool_name);
   ~ClientSocketPoolHistograms();
diff --git a/net/socket/client_socket_pool_manager.h b/net/socket/client_socket_pool_manager.h
index 27dc66d..ac4aeea 100644
--- a/net/socket/client_socket_pool_manager.h
+++ b/net/socket/client_socket_pool_manager.h
@@ -19,7 +19,7 @@
 #include "base/threading/non_thread_safe.h"
 #include "net/base/cert_database.h"
 #include "net/base/completion_callback.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/base/request_priority.h"
 #include "net/socket/client_socket_pool_histograms.h"
 
@@ -110,9 +110,9 @@ class ClientSocketPoolManager : public base::NonThreadSafe,
   SSLClientSocketPool* GetSocketPoolForSSLWithProxy(
       const HostPortPair& proxy_server);
 
-  NET_API static int max_sockets_per_group();
-  NET_API static void set_max_sockets_per_group(int socket_count);
-  NET_API static void set_max_sockets_per_proxy_server(int socket_count);
+  NET_EXPORT static int max_sockets_per_group();
+  NET_EXPORT static void set_max_sockets_per_group(int socket_count);
+  NET_EXPORT static void set_max_sockets_per_proxy_server(int socket_count);
 
   // A helper method that uses the passed in proxy information to initialize a
   // ClientSocketHandle with the relevant socket pool. Use this method for
@@ -137,7 +137,7 @@ class ClientSocketPoolManager : public base::NonThreadSafe,
   // ClientSocketHandle with the relevant socket pool. Use this method for
   // a raw socket connection to a host-port pair (that needs to tunnel through
   // the proxies).
-  NET_API static int InitSocketHandleForRawConnect(
+  NET_EXPORT static int InitSocketHandleForRawConnect(
       const HostPortPair& host_port_pair,
       HttpNetworkSession* session,
       const ProxyInfo& proxy_info,
diff --git a/net/socket/dns_cert_provenance_checker.h b/net/socket/dns_cert_provenance_checker.h
index ac3c659..e6a41ae 100644
--- a/net/socket/dns_cert_provenance_checker.h
+++ b/net/socket/dns_cert_provenance_checker.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/string_piece.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
@@ -17,9 +17,9 @@ class DnsRRResolver;
 
 // DnsCertProvenanceChecker is an interface for asynchronously checking HTTPS
 // certificates via a DNS side-channel.
-class NET_API DnsCertProvenanceChecker {
+class NET_EXPORT DnsCertProvenanceChecker {
  public:
-  class NET_API Delegate {
+  class NET_EXPORT Delegate {
    public:
     virtual ~Delegate();
 
diff --git a/net/socket/server_socket.h b/net/socket/server_socket.h
index 8a2d258..c3e1e8a 100644
--- a/net/socket/server_socket.h
+++ b/net/socket/server_socket.h
@@ -7,14 +7,14 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "net/base/completion_callback.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
 class IPEndPoint;
 class StreamSocket;
 
-class NET_API ServerSocket {
+class NET_EXPORT ServerSocket {
  public:
   ServerSocket() { }
   virtual ~ServerSocket() { }
diff --git a/net/socket/socket.h b/net/socket/socket.h
index 450f42d..650bfd6 100644
--- a/net/socket/socket.h
+++ b/net/socket/socket.h
@@ -7,14 +7,14 @@
 #pragma once
 
 #include "net/base/completion_callback.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
 class IOBuffer;
 
 // Represents a read/write socket.
-class NET_API Socket {
+class NET_EXPORT Socket {
  public:
   virtual ~Socket() {}
 
diff --git a/net/socket/socks5_client_socket.h b/net/socket/socks5_client_socket.h
index a9d30df..97fa61a 100644
--- a/net/socket/socks5_client_socket.h
+++ b/net/socket/socks5_client_socket.h
@@ -27,7 +27,7 @@ class BoundNetLog;
 
 // This StreamSocket is used to setup a SOCKSv5 handshake with a socks proxy.
 // Currently no SOCKSv5 authentication is supported.
-class NET_TEST SOCKS5ClientSocket : public StreamSocket {
+class NET_EXPORT_PRIVATE SOCKS5ClientSocket : public StreamSocket {
  public:
   // Takes ownership of the |transport_socket|, which should already be
   // connected by the time Connect() is called.
diff --git a/net/socket/socks_client_socket.h b/net/socket/socks_client_socket.h
index 286538f..f7929b5 100644
--- a/net/socket/socks_client_socket.h
+++ b/net/socket/socks_client_socket.h
@@ -27,7 +27,7 @@ class ClientSocketHandle;
 class BoundNetLog;
 
 // The SOCKS client socket implementation
-class NET_TEST SOCKSClientSocket : public StreamSocket {
+class NET_EXPORT_PRIVATE SOCKSClientSocket : public StreamSocket {
  public:
   // Takes ownership of the |transport_socket|, which should already be
   // connected by the time Connect() is called.
diff --git a/net/socket/socks_client_socket_pool.h b/net/socket/socks_client_socket_pool.h
index c160eda..56b4848 100644
--- a/net/socket/socks_client_socket_pool.h
+++ b/net/socket/socks_client_socket_pool.h
@@ -25,7 +25,8 @@ class ConnectJobFactory;
 class TransportClientSocketPool;
 class TransportSocketParams;
 
-class NET_TEST SOCKSSocketParams : public base::RefCounted<SOCKSSocketParams> {
+class NET_EXPORT_PRIVATE SOCKSSocketParams
+    : public base::RefCounted<SOCKSSocketParams> {
  public:
   SOCKSSocketParams(const scoped_refptr<TransportSocketParams>& proxy_server,
                     bool socks_v5, const HostPortPair& host_port_pair,
@@ -104,7 +105,7 @@ class SOCKSConnectJob : public ConnectJob {
   DISALLOW_COPY_AND_ASSIGN(SOCKSConnectJob);
 };
 
-class NET_TEST SOCKSClientSocketPool : public ClientSocketPool {
+class NET_EXPORT_PRIVATE SOCKSClientSocketPool : public ClientSocketPool {
  public:
   SOCKSClientSocketPool(
       int max_sockets,
diff --git a/net/socket/ssl_client_socket.h b/net/socket/ssl_client_socket.h
index ba7fefb..46865f7 100644
--- a/net/socket/ssl_client_socket.h
+++ b/net/socket/ssl_client_socket.h
@@ -79,7 +79,7 @@ struct SSLClientSocketContext {
 // connection is established.  If a SSL error occurs during the handshake,
 // Connect will fail.
 //
-class NET_API SSLClientSocket : public StreamSocket {
+class NET_EXPORT SSLClientSocket : public StreamSocket {
  public:
   SSLClientSocket();
 
diff --git a/net/socket/ssl_client_socket_pool.h b/net/socket/ssl_client_socket_pool.h
index 5db1fd4..7d9134d 100644
--- a/net/socket/ssl_client_socket_pool.h
+++ b/net/socket/ssl_client_socket_pool.h
@@ -40,7 +40,8 @@ struct RRResponse;
 
 // SSLSocketParams only needs the socket params for the transport socket
 // that will be used (denoted by |proxy|).
-class NET_TEST SSLSocketParams : public base::RefCounted<SSLSocketParams> {
+class NET_EXPORT_PRIVATE SSLSocketParams
+    : public base::RefCounted<SSLSocketParams> {
  public:
   SSLSocketParams(const scoped_refptr<TransportSocketParams>& transport_params,
                   const scoped_refptr<SOCKSSocketParams>& socks_params,
@@ -165,8 +166,9 @@ class SSLConnectJob : public ConnectJob {
   DISALLOW_COPY_AND_ASSIGN(SSLConnectJob);
 };
 
-class NET_TEST SSLClientSocketPool : public ClientSocketPool,
-                                     public SSLConfigService::Observer {
+class NET_EXPORT_PRIVATE SSLClientSocketPool
+    : public ClientSocketPool,
+      public SSLConfigService::Observer {
  public:
   // Only the pools that will be used are required. i.e. if you never
   // try to create an SSL over SOCKS socket, |socks_pool| may be NULL.
diff --git a/net/socket/ssl_server_socket.h b/net/socket/ssl_server_socket.h
index a1a7f9a..d01ad72 100644
--- a/net/socket/ssl_server_socket.h
+++ b/net/socket/ssl_server_socket.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "net/base/completion_callback.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/socket/stream_socket.h"
 
 namespace base {
@@ -54,7 +54,7 @@ class SSLServerSocket : public StreamSocket {
 //
 // The caller starts the SSL server handshake by calling Handshake on the
 // returned socket.
-NET_API SSLServerSocket* CreateSSLServerSocket(
+NET_EXPORT SSLServerSocket* CreateSSLServerSocket(
     StreamSocket* socket,
     X509Certificate* certificate,
     crypto::RSAPrivateKey* key,
diff --git a/net/socket/stream_socket.h b/net/socket/stream_socket.h
index ef2f698..85bb352 100644
--- a/net/socket/stream_socket.h
+++ b/net/socket/stream_socket.h
@@ -15,7 +15,7 @@ namespace net {
 class AddressList;
 class IPEndPoint;
 
-class NET_TEST StreamSocket : public Socket {
+class NET_EXPORT_PRIVATE StreamSocket : public Socket {
  public:
   virtual ~StreamSocket() {}
 
diff --git a/net/socket/tcp_client_socket.h b/net/socket/tcp_client_socket.h
index d756645d..dd72721 100644
--- a/net/socket/tcp_client_socket.h
+++ b/net/socket/tcp_client_socket.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "build/build_config.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 #if defined(OS_WIN)
 #include "net/socket/tcp_client_socket_win.h"
@@ -26,7 +26,7 @@ typedef TCPClientSocketLibevent TCPClientSocket;
 
 // Enable/disable experimental TCP FastOpen option.
 // Not thread safe.  Must be called during initialization/startup only.
-NET_API void set_tcp_fastopen_enabled(bool value);
+NET_EXPORT void set_tcp_fastopen_enabled(bool value);
 
 // Check if the TCP FastOpen option is enabled.
 bool is_tcp_fastopen_enabled();
diff --git a/net/socket/tcp_client_socket_libevent.h b/net/socket/tcp_client_socket_libevent.h
index f77c556..b0cc7a6 100644
--- a/net/socket/tcp_client_socket_libevent.h
+++ b/net/socket/tcp_client_socket_libevent.h
@@ -20,8 +20,8 @@ namespace net {
 class BoundNetLog;
 
 // A client socket that uses TCP as the transport layer.
-class NET_TEST TCPClientSocketLibevent : public StreamSocket,
-                                         public base::NonThreadSafe {
+class NET_EXPORT_PRIVATE TCPClientSocketLibevent : public StreamSocket,
+                                                   public base::NonThreadSafe {
  public:
   // The IP address(es) and port number to connect to.  The TCP socket will try
   // each IP address in the list until it succeeds in establishing a
diff --git a/net/socket/tcp_client_socket_win.h b/net/socket/tcp_client_socket_win.h
index b1f9f3b..ee08509 100644
--- a/net/socket/tcp_client_socket_win.h
+++ b/net/socket/tcp_client_socket_win.h
@@ -19,8 +19,8 @@ namespace net {
 
 class BoundNetLog;
 
-class NET_API TCPClientSocketWin : public StreamSocket,
-                                   NON_EXPORTED_BASE(base::NonThreadSafe) {
+class NET_EXPORT TCPClientSocketWin : public StreamSocket,
+                                      NON_EXPORTED_BASE(base::NonThreadSafe) {
  public:
   // The IP address(es) and port number to connect to.  The TCP socket will try
   // each IP address in the list until it succeeds in establishing a
diff --git a/net/socket/tcp_server_socket_libevent.h b/net/socket/tcp_server_socket_libevent.h
index 9ebd6a4..90e90d8 100644
--- a/net/socket/tcp_server_socket_libevent.h
+++ b/net/socket/tcp_server_socket_libevent.h
@@ -16,9 +16,10 @@ namespace net {
 
 class IPEndPoint;
 
-class NET_TEST TCPServerSocketLibevent : public ServerSocket,
-                                         public base::NonThreadSafe,
-                                         public MessageLoopForIO::Watcher {
+class NET_EXPORT_PRIVATE TCPServerSocketLibevent
+    : public ServerSocket,
+      public base::NonThreadSafe,
+      public MessageLoopForIO::Watcher {
  public:
   TCPServerSocketLibevent(net::NetLog* net_log,
                           const net::NetLog::Source& source);
diff --git a/net/socket/tcp_server_socket_win.h b/net/socket/tcp_server_socket_win.h
index b78bb8e..8da5fa1 100644
--- a/net/socket/tcp_server_socket_win.h
+++ b/net/socket/tcp_server_socket_win.h
@@ -18,7 +18,7 @@ namespace net {
 
 class IPEndPoint;
 
-class NET_TEST TCPServerSocketWin
+class NET_EXPORT_PRIVATE TCPServerSocketWin
     : public ServerSocket,
       NON_EXPORTED_BASE(public base::NonThreadSafe),
       public base::win::ObjectWatcher::Delegate  {
diff --git a/net/socket/transport_client_socket_pool.h b/net/socket/transport_client_socket_pool.h
index bcd8703..e0b6080 100644
--- a/net/socket/transport_client_socket_pool.h
+++ b/net/socket/transport_client_socket_pool.h
@@ -24,7 +24,7 @@ namespace net {
 
 class ClientSocketFactory;
 
-class NET_TEST TransportSocketParams
+class NET_EXPORT_PRIVATE TransportSocketParams
     : public base::RefCounted<TransportSocketParams> {
  public:
   TransportSocketParams(const HostPortPair& host_port_pair,
@@ -57,7 +57,7 @@ class NET_TEST TransportSocketParams
 // (kIPv6FallbackTimerInMs) and start a connect() to a IPv4 address if the timer
 // fires. Then we race the IPv4 connect() against the IPv6 connect() (which has
 // a headstart) and return the one that completes first to the socket pool.
-class NET_TEST TransportConnectJob : public ConnectJob {
+class NET_EXPORT_PRIVATE TransportConnectJob : public ConnectJob {
  public:
   TransportConnectJob(const std::string& group_name,
                       const scoped_refptr<TransportSocketParams>& params,
@@ -132,7 +132,7 @@ class NET_TEST TransportConnectJob : public ConnectJob {
   DISALLOW_COPY_AND_ASSIGN(TransportConnectJob);
 };
 
-class NET_TEST TransportClientSocketPool : public ClientSocketPool {
+class NET_EXPORT_PRIVATE TransportClientSocketPool : public ClientSocketPool {
  public:
   TransportClientSocketPool(
       int max_sockets,
diff --git a/net/socket/web_socket_server_socket.h b/net/socket/web_socket_server_socket.h
index c28c58d..55c273e 100644
--- a/net/socket/web_socket_server_socket.h
+++ b/net/socket/web_socket_server_socket.h
@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/socket/socket.h"
 
 namespace net {
@@ -55,8 +55,9 @@ class WebSocketServerSocket : public Socket {
 
 // Creates websocket server socket atop of already connected socket. This
 // created server socket will take ownership of |transport_socket|.
-NET_API WebSocketServerSocket* CreateWebSocketServerSocket(
-    Socket* transport_socket, WebSocketServerSocket::Delegate* delegate);
+NET_EXPORT WebSocketServerSocket* CreateWebSocketServerSocket(
+    Socket* transport_socket,
+    WebSocketServerSocket::Delegate* delegate);
 
 }  // namespace net
 
diff --git a/net/socket_stream/socket_stream.h b/net/socket_stream/socket_stream.h
index 5e5b339..9ce0074 100644
--- a/net/socket_stream/socket_stream.h
+++ b/net/socket_stream/socket_stream.h
@@ -18,7 +18,7 @@
 #include "net/base/address_list.h"
 #include "net/base/completion_callback.h"
 #include "net/base/io_buffer.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/base/net_log.h"
 #include "net/base/net_errors.h"
 #include "net/base/ssl_config_service.h"
@@ -46,7 +46,8 @@ class SocketStreamMetrics;
 // authentication identity for proxy URL first.  If server requires proxy
 // authentication, it will try authentication identity for realm that server
 // requests.
-class NET_API SocketStream : public base::RefCountedThreadSafe<SocketStream> {
+class NET_EXPORT SocketStream
+    : public base::RefCountedThreadSafe<SocketStream> {
  public:
   // Derive from this class and add your own data members to associate extra
   // information with a SocketStream.  Use GetUserData(key) and
@@ -57,7 +58,7 @@ class NET_API SocketStream : public base::RefCountedThreadSafe<SocketStream> {
     virtual ~UserData() {}
   };
 
-  class NET_API Delegate {
+  class NET_EXPORT Delegate {
    public:
     virtual ~Delegate() {}
 
diff --git a/net/socket_stream/socket_stream_job.h b/net/socket_stream/socket_stream_job.h
index 7f8175d..0b87c1a 100644
--- a/net/socket_stream/socket_stream_job.h
+++ b/net/socket_stream/socket_stream_job.h
@@ -10,7 +10,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/string16.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/socket_stream/socket_stream.h"
 
 class GURL;
@@ -26,7 +26,7 @@ class TransportSecurityState;
 // WebSocketJob) to do some work on data over SocketStream.
 // Registers the protocol specific SocketStreamJob by RegisterProtocolFactory
 // and call CreateSocketStreamJob to create SocketStreamJob for the URL.
-class NET_API SocketStreamJob
+class NET_EXPORT SocketStreamJob
     : public base::RefCountedThreadSafe<SocketStreamJob> {
  public:
   // Callback function implemented by protocol handlers to create new jobs.
diff --git a/net/socket_stream/socket_stream_metrics.h b/net/socket_stream/socket_stream_metrics.h
index e69ba25..252a9ea 100644
--- a/net/socket_stream/socket_stream_metrics.h
+++ b/net/socket_stream/socket_stream_metrics.h
@@ -11,13 +11,13 @@
 
 #include "base/basictypes.h"
 #include "base/time.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 class GURL;
 
 namespace net {
 
-class NET_TEST SocketStreamMetrics {
+class NET_EXPORT_PRIVATE SocketStreamMetrics {
  public:
   enum ProtocolType {
     PROTOCOL_UNKNOWN,
diff --git a/net/spdy/spdy_frame_builder.h b/net/spdy/spdy_frame_builder.h
index fd30a54..4e32009 100644
--- a/net/spdy/spdy_frame_builder.h
+++ b/net/spdy/spdy_frame_builder.h
@@ -9,7 +9,7 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/base/sys_byteorder.h"
 #include "net/spdy/spdy_protocol.h"
 
@@ -26,7 +26,7 @@ namespace spdy {
 // When reading from a SpdyFrameBuilder the consumer must know what value types
 // to read and in what order to read them as the SpdyFrameBuilder does not keep
 // track of the type of data written to it.
-class NET_TEST SpdyFrameBuilder {
+class NET_EXPORT_PRIVATE SpdyFrameBuilder {
  public:
   SpdyFrameBuilder();
 
diff --git a/net/spdy/spdy_framer.h b/net/spdy/spdy_framer.h
index 4fe68d2..c7dcf5a 100644
--- a/net/spdy/spdy_framer.h
+++ b/net/spdy/spdy_framer.h
@@ -14,7 +14,7 @@
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/base/sys_byteorder.h"
 #include "net/spdy/spdy_protocol.h"
 
@@ -54,7 +54,7 @@ typedef std::list<SpdySetting> SpdySettings;
 // SpdyFramerVisitorInterface is a set of callbacks for the SpdyFramer.
 // Implement this interface to receive event callbacks as frames are
 // decoded from the framer.
-class NET_TEST SpdyFramerVisitorInterface {
+class NET_EXPORT_PRIVATE SpdyFramerVisitorInterface {
  public:
   virtual ~SpdyFramerVisitorInterface() {}
 
@@ -75,7 +75,7 @@ class NET_TEST SpdyFramerVisitorInterface {
                                  size_t len) = 0;
 };
 
-class NET_TEST SpdyFramer {
+class NET_EXPORT_PRIVATE SpdyFramer {
  public:
   // SPDY states.
   // TODO(mbelshe): Can we move these into the implementation
diff --git a/net/spdy/spdy_http_stream.h b/net/spdy/spdy_http_stream.h
index b6727e5..4bb5d58 100644
--- a/net/spdy/spdy_http_stream.h
+++ b/net/spdy/spdy_http_stream.h
@@ -29,7 +29,8 @@ class UploadData;
 class UploadDataStream;
 
 // The SpdyHttpStream is a HTTP-specific type of stream known to a SpdySession.
-class NET_TEST SpdyHttpStream : public SpdyStream::Delegate, public HttpStream {
+class NET_EXPORT_PRIVATE SpdyHttpStream : public SpdyStream::Delegate,
+                                          public HttpStream {
  public:
   SpdyHttpStream(SpdySession* spdy_session, bool direct);
   virtual ~SpdyHttpStream();
diff --git a/net/spdy/spdy_http_utils.h b/net/spdy/spdy_http_utils.h
index eede59f..d6f1a65 100644
--- a/net/spdy/spdy_http_utils.h
+++ b/net/spdy/spdy_http_utils.h
@@ -6,7 +6,7 @@
 #define NET_SPDY_SPDY_HTTP_UTILS_H_
 #pragma once
 
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/base/request_priority.h"
 #include "net/spdy/spdy_framer.h"
 
@@ -31,7 +31,8 @@ void CreateSpdyHeadersFromHttpRequest(const HttpRequestInfo& info,
                                       spdy::SpdyHeaderBlock* headers,
                                       bool direct);
 
-NET_TEST int ConvertRequestPriorityToSpdyPriority(RequestPriority priority);
+NET_EXPORT_PRIVATE int ConvertRequestPriorityToSpdyPriority(
+    RequestPriority priority);
 
 }  // namespace net
 
diff --git a/net/spdy/spdy_io_buffer.h b/net/spdy/spdy_io_buffer.h
index 9cb3811..e96c946 100644
--- a/net/spdy/spdy_io_buffer.h
+++ b/net/spdy/spdy_io_buffer.h
@@ -8,7 +8,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "net/base/io_buffer.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/spdy/spdy_stream.h"
 
 namespace net {
@@ -17,7 +17,7 @@ namespace net {
 // so that the SpdySession sends them in the right order.  Further, they need
 // to track the SpdyStream which they are associated with so that incremental
 // completion of the IO can notify the appropriate stream of completion.
-class NET_TEST SpdyIOBuffer {
+class NET_EXPORT_PRIVATE SpdyIOBuffer {
  public:
   // Constructor
   // |buffer| is the actual data buffer.
diff --git a/net/spdy/spdy_proxy_client_socket.h b/net/spdy/spdy_proxy_client_socket.h
index e6598ea..1b423c2 100644
--- a/net/spdy/spdy_proxy_client_socket.h
+++ b/net/spdy/spdy_proxy_client_socket.h
@@ -36,8 +36,8 @@ class IOBuffer;
 class SpdySession;
 class SpdyStream;
 
-class NET_TEST SpdyProxyClientSocket : public ProxyClientSocket,
-                                       public SpdyStream::Delegate {
+class NET_EXPORT_PRIVATE SpdyProxyClientSocket : public ProxyClientSocket,
+                                                 public SpdyStream::Delegate {
  public:
   // Create a socket on top of the |spdy_stream| by sending a SYN_STREAM
   // CONNECT frame for |endpoint|.  After the SYN_REPLY is received,
diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h
index 58e617b..4281a20 100644
--- a/net/spdy/spdy_session.h
+++ b/net/spdy/spdy_session.h
@@ -44,8 +44,8 @@ class SpdySettingsStorage;
 class SpdyStream;
 class SSLInfo;
 
-class NET_API SpdySession : public base::RefCounted<SpdySession>,
-                            public spdy::SpdyFramerVisitorInterface {
+class NET_EXPORT SpdySession : public base::RefCounted<SpdySession>,
+                               public spdy::SpdyFramerVisitorInterface {
  public:
   // Create a new SpdySession.
   // |host_port_proxy_pair| is the host/port that this session connects to, and
diff --git a/net/spdy/spdy_session_pool.h b/net/spdy/spdy_session_pool.h
index b31e4e9..327e179 100644
--- a/net/spdy/spdy_session_pool.h
+++ b/net/spdy/spdy_session_pool.h
@@ -17,8 +17,8 @@
 #include "net/base/cert_database.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/ip_endpoint.h"
-#include "net/base/net_api.h"
 #include "net/base/net_errors.h"
+#include "net/base/net_export.h"
 #include "net/base/network_change_notifier.h"
 #include "net/base/ssl_config_service.h"
 #include "net/proxy/proxy_config.h"
@@ -35,7 +35,7 @@ class HttpNetworkSession;
 class SpdySession;
 
 // This is a very simple pool for open SpdySessions.
-class NET_API SpdySessionPool
+class NET_EXPORT SpdySessionPool
     : public NetworkChangeNotifier::IPAddressObserver,
       public SSLConfigService::Observer,
       public CertDatabase::Observer {
diff --git a/net/spdy/spdy_settings_storage.h b/net/spdy/spdy_settings_storage.h
index 67bf0d1..cf0f9ab 100644
--- a/net/spdy/spdy_settings_storage.h
+++ b/net/spdy/spdy_settings_storage.h
@@ -9,14 +9,14 @@
 #include <map>
 #include "base/basictypes.h"
 #include "net/base/host_port_pair.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/spdy/spdy_framer.h"
 
 namespace net {
 
 // SpdySettingsStorage stores SpdySettings which have been transmitted between
 // endpoints for the SPDY SETTINGS frame.
-class NET_TEST SpdySettingsStorage {
+class NET_EXPORT_PRIVATE SpdySettingsStorage {
  public:
   SpdySettingsStorage();
   ~SpdySettingsStorage();
diff --git a/net/spdy/spdy_stream.h b/net/spdy/spdy_stream.h
index 8bbee32..f7e8699 100644
--- a/net/spdy/spdy_stream.h
+++ b/net/spdy/spdy_stream.h
@@ -16,7 +16,7 @@
 #include "googleurl/src/gurl.h"
 #include "net/base/bandwidth_metrics.h"
 #include "net/base/io_buffer.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/base/net_log.h"
 #include "net/base/upload_data.h"
 #include "net/spdy/spdy_framer.h"
@@ -37,12 +37,12 @@ class SSLInfo;
 // a SpdyNetworkTransaction) will maintain a reference to the stream.  When
 // initiated by the server, only the SpdySession will maintain any reference,
 // until such a time as a client object requests a stream for the path.
-class NET_TEST SpdyStream
+class NET_EXPORT_PRIVATE SpdyStream
     : public base::RefCounted<SpdyStream>,
       public ChunkCallback {
  public:
   // Delegate handles protocol specific behavior of spdy stream.
-  class NET_TEST Delegate {
+  class NET_EXPORT_PRIVATE Delegate {
    public:
     Delegate() {}
 
diff --git a/net/spdy/spdy_websocket_stream.h b/net/spdy/spdy_websocket_stream.h
index 59610aa..138c38e 100644
--- a/net/spdy/spdy_websocket_stream.h
+++ b/net/spdy/spdy_websocket_stream.h
@@ -21,11 +21,11 @@ namespace net {
 // The SpdyWebSocketStream is a WebSocket-specific type of stream known to a
 // SpdySession. WebSocket's opening handshake is converted to SPDY's
 // SYN_STREAM/SYN_REPLY. WebSocket frames are encapsulated as SPDY data frames.
-class NET_TEST SpdyWebSocketStream
+class NET_EXPORT_PRIVATE SpdyWebSocketStream
     : public SpdyStream::Delegate {
  public:
   // Delegate handles asynchronous events.
-  class NET_TEST Delegate {
+  class NET_EXPORT_PRIVATE Delegate {
    public:
     // Called when InitializeStream() finishes asynchronously. This delegate is
     // called if InitializeStream() returns ERR_IO_PENDING. |status| indicates
diff --git a/net/third_party/mozilla_security_manager/nsNSSCertTrust.h b/net/third_party/mozilla_security_manager/nsNSSCertTrust.h
index 268ba0a..bc42fd0 100644
--- a/net/third_party/mozilla_security_manager/nsNSSCertTrust.h
+++ b/net/third_party/mozilla_security_manager/nsNSSCertTrust.h
@@ -42,7 +42,7 @@
 #include <certt.h>
 #include <certdb.h>
 
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace mozilla_security_manager {
 
@@ -51,7 +51,7 @@ namespace mozilla_security_manager {
  * 
  * Class for maintaining trust flags for an NSS certificate.
  */
-class NET_API nsNSSCertTrust
+class NET_EXPORT nsNSSCertTrust
 {
 public:
   nsNSSCertTrust();
diff --git a/net/tools/crash_cache/crash_cache.cc b/net/tools/crash_cache/crash_cache.cc
index f1b4b79..57fa32c 100644
--- a/net/tools/crash_cache/crash_cache.cc
+++ b/net/tools/crash_cache/crash_cache.cc
@@ -20,8 +20,8 @@
 #include "base/string_util.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
-#include "net/base/net_api.h"
 #include "net/base/net_errors.h"
+#include "net/base/net_export.h"
 #include "net/base/test_completion_callback.h"
 #include "net/disk_cache/backend_impl.h"
 #include "net/disk_cache/disk_cache.h"
@@ -80,7 +80,7 @@ int MasterCode() {
 // -----------------------------------------------------------------------
 
 namespace disk_cache {
-NET_TEST extern RankCrashes g_rankings_crash;
+NET_EXPORT_PRIVATE extern RankCrashes g_rankings_crash;
 }
 
 const char* kCrashEntryName = "the first key";
diff --git a/net/udp/datagram_client_socket.h b/net/udp/datagram_client_socket.h
index 9eb1d55..f7d2707 100644
--- a/net/udp/datagram_client_socket.h
+++ b/net/udp/datagram_client_socket.h
@@ -13,7 +13,8 @@ namespace net {
 
 class IPEndPoint;
 
-class NET_TEST DatagramClientSocket : public DatagramSocket, public Socket {
+class NET_EXPORT_PRIVATE DatagramClientSocket : public DatagramSocket,
+                                                public Socket {
  public:
   virtual ~DatagramClientSocket() {}
 
diff --git a/net/udp/datagram_server_socket.h b/net/udp/datagram_server_socket.h
index ed34580..9f2c2ea6 100644
--- a/net/udp/datagram_server_socket.h
+++ b/net/udp/datagram_server_socket.h
@@ -15,7 +15,7 @@ class IPEndPoint;
 class IOBuffer;
 
 // A UDP Socket.
-class NET_API DatagramServerSocket : public DatagramSocket {
+class NET_EXPORT DatagramServerSocket : public DatagramSocket {
  public:
   virtual ~DatagramServerSocket() {}
 
diff --git a/net/udp/datagram_socket.h b/net/udp/datagram_socket.h
index 514df6e..127fce3 100644
--- a/net/udp/datagram_socket.h
+++ b/net/udp/datagram_socket.h
@@ -6,7 +6,7 @@
 #define NET_UDP_DATAGRAM_SOCKET_H_
 #pragma once
 
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
@@ -15,7 +15,7 @@ class IPEndPoint;
 
 // A datagram socket is an interface to a protocol which exchanges
 // datagrams, like UDP.
-class NET_TEST DatagramSocket {
+class NET_EXPORT_PRIVATE DatagramSocket {
  public:
   // Type of source port binding to use.
   enum BindType {
diff --git a/net/udp/udp_client_socket.h b/net/udp/udp_client_socket.h
index 64b17dca..cb4d525 100644
--- a/net/udp/udp_client_socket.h
+++ b/net/udp/udp_client_socket.h
@@ -16,7 +16,7 @@ namespace net {
 class BoundNetLog;
 
 // A client socket that uses UDP as the transport layer.
-class NET_TEST UDPClientSocket : public DatagramClientSocket {
+class NET_EXPORT_PRIVATE UDPClientSocket : public DatagramClientSocket {
  public:
   UDPClientSocket(DatagramSocket::BindType bind_type,
                   const RandIntCallback& rand_int_cb,
diff --git a/net/udp/udp_server_socket.h b/net/udp/udp_server_socket.h
index 643949e..6fdc2c4 100644
--- a/net/udp/udp_server_socket.h
+++ b/net/udp/udp_server_socket.h
@@ -16,7 +16,7 @@ class IPEndPoint;
 class BoundNetLog;
 
 // A client socket that uses UDP as the transport layer.
-class NET_API UDPServerSocket : public DatagramServerSocket {
+class NET_EXPORT UDPServerSocket : public DatagramServerSocket {
  public:
   UDPServerSocket(net::NetLog* net_log,
                   const net::NetLog::Source& source);
diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h
index c5354e1..5eaf2bdb 100644
--- a/net/url_request/url_request.h
+++ b/net/url_request/url_request.h
@@ -19,7 +19,7 @@
 #include "googleurl/src/gurl.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/base/net_log.h"
 #include "net/base/request_priority.h"
 #include "net/http/http_request_headers.h"
@@ -104,7 +104,7 @@ typedef std::vector<std::string> ResponseCookies;
 //
 // NOTE: All usage of all instances of this class should be on the same thread.
 //
-class NET_API URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe) {
+class NET_EXPORT URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe) {
  public:
   // Callback function implemented by protocol handlers to create new jobs.
   // The factory may return NULL to indicate an error, which will cause other
@@ -131,7 +131,7 @@ class NET_API URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe) {
 
   // This class handles network interception.  Use with
   // (Un)RegisterRequestInterceptor.
-  class NET_API Interceptor {
+  class NET_EXPORT Interceptor {
   public:
     virtual ~Interceptor() {}
 
@@ -163,7 +163,7 @@ class NET_API URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe) {
   // Deprecated interfaces in net::URLRequest. They have been moved to
   // URLRequest's private section to prevent new uses. Existing uses are
   // explicitly friended here and should be removed over time.
-  class NET_API Deprecated {
+  class NET_EXPORT Deprecated {
    private:
     // TODO(willchan): Kill off these friend declarations.
     friend class ::AutoUpdateInterceptor;
@@ -220,7 +220,7 @@ class NET_API URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe) {
   // if an error occurred, or if the IO is just pending.  When Read() returns
   // true with zero bytes read, it indicates the end of the response.
   //
-  class NET_API Delegate {
+  class NET_EXPORT Delegate {
    public:
     virtual ~Delegate() {}
 
diff --git a/net/url_request/url_request_about_job.h b/net/url_request/url_request_about_job.h
index c3f4e22..461b9e4 100644
--- a/net/url_request/url_request_about_job.h
+++ b/net/url_request/url_request_about_job.h
@@ -14,7 +14,7 @@
 
 namespace net {
 
-class NET_API URLRequestAboutJob : public URLRequestJob {
+class NET_EXPORT URLRequestAboutJob : public URLRequestJob {
  public:
   explicit URLRequestAboutJob(URLRequest* request);
 
diff --git a/net/url_request/url_request_context.h b/net/url_request/url_request_context.h
index 5a2b693..eb2f61f 100644
--- a/net/url_request/url_request_context.h
+++ b/net/url_request/url_request_context.h
@@ -15,7 +15,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/base/net_log.h"
 #include "net/base/ssl_config_service.h"
 #include "net/base/transport_security_state.h"
@@ -40,7 +40,7 @@ class URLRequestJobFactory;
 // instances. Note that URLRequestContext typically does not provide storage for
 // these member variables, since they may be shared. For the ones that aren't
 // shared, URLRequestContextStorage can be helpful in defining their storage.
-class NET_API URLRequestContext
+class NET_EXPORT URLRequestContext
     : public base::RefCountedThreadSafe<URLRequestContext>,
       NON_EXPORTED_BASE(public base::NonThreadSafe) {
  public:
diff --git a/net/url_request/url_request_context_getter.h b/net/url_request/url_request_context_getter.h
index 57406d4..88421f4 100644
--- a/net/url_request/url_request_context_getter.h
+++ b/net/url_request/url_request_context_getter.h
@@ -8,7 +8,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/task.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace base {
 class MessageLoopProxy;
@@ -21,7 +21,7 @@ class URLRequestContext;
 struct URLRequestContextGetterTraits;
 
 // Interface for retrieving an net::URLRequestContext.
-class NET_API URLRequestContextGetter
+class NET_EXPORT URLRequestContextGetter
     : public base::RefCountedThreadSafe<URLRequestContextGetter,
                                         URLRequestContextGetterTraits> {
  public:
diff --git a/net/url_request/url_request_context_storage.h b/net/url_request/url_request_context_storage.h
index 7c3311a..0c93f0f 100644
--- a/net/url_request/url_request_context_storage.h
+++ b/net/url_request/url_request_context_storage.h
@@ -9,7 +9,7 @@
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
@@ -32,7 +32,7 @@ class URLRequestJobFactory;
 
 // URLRequestContextStorage is a helper class that provides storage for unowned
 // member variables of URLRequestContext.
-class NET_API URLRequestContextStorage {
+class NET_EXPORT URLRequestContextStorage {
  public:
   // Note that URLRequestContextStorage does not acquire a reference to
   // URLRequestContext, since it is often designed to be embedded in a
diff --git a/net/url_request/url_request_error_job.h b/net/url_request/url_request_error_job.h
index e26ecd3..fea3bf0 100644
--- a/net/url_request/url_request_error_job.h
+++ b/net/url_request/url_request_error_job.h
@@ -10,12 +10,12 @@
 #pragma once
 
 #include "base/task.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/url_request/url_request_job.h"
 
 namespace net {
 
-class NET_API URLRequestErrorJob : public URLRequestJob {
+class NET_EXPORT URLRequestErrorJob : public URLRequestJob {
  public:
   URLRequestErrorJob(URLRequest* request, int error);
 
diff --git a/net/url_request/url_request_file_job.h b/net/url_request/url_request_file_job.h
index 9fc3e23..cda164e 100644
--- a/net/url_request/url_request_file_job.h
+++ b/net/url_request/url_request_file_job.h
@@ -13,7 +13,7 @@
 #include "base/task.h"
 #include "net/base/completion_callback.h"
 #include "net/base/file_stream.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/http/http_byte_range.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job.h"
@@ -25,7 +25,7 @@ struct FileInfo;
 namespace net {
 
 // A request job that handles reading file URLs
-class NET_API URLRequestFileJob : public URLRequestJob {
+class NET_EXPORT URLRequestFileJob : public URLRequestJob {
  public:
   URLRequestFileJob(URLRequest* request, const FilePath& file_path);
 
diff --git a/net/url_request/url_request_filter.h b/net/url_request/url_request_filter.h
index 2a173f8..6ea0624 100644
--- a/net/url_request/url_request_filter.h
+++ b/net/url_request/url_request_filter.h
@@ -24,7 +24,7 @@
 #include <string>
 
 #include "base/hash_tables.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/url_request/url_request.h"
 
 class GURL;
@@ -32,7 +32,7 @@ class GURL;
 namespace net {
 class URLRequestJob;
 
-class NET_API URLRequestFilter {
+class NET_EXPORT URLRequestFilter {
  public:
   // scheme,hostname -> ProtocolFactory
   typedef std::map<std::pair<std::string, std::string>,
diff --git a/net/url_request/url_request_job.h b/net/url_request/url_request_job.h
index a2ab7e8..afb5484 100644
--- a/net/url_request/url_request_job.h
+++ b/net/url_request/url_request_job.h
@@ -19,7 +19,7 @@
 #include "net/base/filter.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/load_states.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
@@ -35,8 +35,8 @@ class UploadData;
 class URLRequestStatus;
 class X509Certificate;
 
-class NET_API URLRequestJob : public base::RefCounted<URLRequestJob>,
-                              public base::SystemMonitor::PowerObserver {
+class NET_EXPORT URLRequestJob : public base::RefCounted<URLRequestJob>,
+                                 public base::SystemMonitor::PowerObserver {
  public:
   explicit URLRequestJob(URLRequest* request);
 
diff --git a/net/url_request/url_request_job_factory.h b/net/url_request/url_request_job_factory.h
index de32481..86eb8d2 100644
--- a/net/url_request/url_request_job_factory.h
+++ b/net/url_request/url_request_job_factory.h
@@ -11,7 +11,7 @@
 #include <vector>
 #include "base/basictypes.h"
 #include "base/threading/non_thread_safe.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 class GURL;
 
@@ -20,17 +20,17 @@ namespace net {
 class URLRequest;
 class URLRequestJob;
 
-class NET_API URLRequestJobFactory
+class NET_EXPORT URLRequestJobFactory
     : NON_EXPORTED_BASE(public base::NonThreadSafe) {
  public:
-  class NET_API ProtocolHandler {
+  class NET_EXPORT ProtocolHandler {
    public:
     virtual ~ProtocolHandler();
 
     virtual URLRequestJob* MaybeCreateJob(URLRequest* request) const = 0;
   };
 
-  class NET_API Interceptor {
+  class NET_EXPORT Interceptor {
    public:
     virtual ~Interceptor();
 
diff --git a/net/url_request/url_request_netlog_params.h b/net/url_request/url_request_netlog_params.h
index 5a147dc..92b5404 100644
--- a/net/url_request/url_request_netlog_params.h
+++ b/net/url_request/url_request_netlog_params.h
@@ -10,14 +10,15 @@
 
 #include "base/basictypes.h"
 #include "googleurl/src/gurl.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/base/net_log.h"
 #include "net/base/request_priority.h"
 
 namespace net {
 
 // Holds the parameters to emit to the NetLog when starting a URLRequest.
-class NET_API URLRequestStartEventParameters : public NetLog::EventParameters {
+class NET_EXPORT URLRequestStartEventParameters
+    : public NetLog::EventParameters {
  public:
   URLRequestStartEventParameters(const GURL& url,
                                  const std::string& method,
diff --git a/net/url_request/url_request_redirect_job.h b/net/url_request/url_request_redirect_job.h
index c8698a1..73898de 100644
--- a/net/url_request/url_request_redirect_job.h
+++ b/net/url_request/url_request_redirect_job.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/task.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/url_request/url_request_job.h"
 
 class GURL;
@@ -17,7 +17,7 @@ namespace net {
 // A URLRequestJob that will redirect the request to the specified
 // URL.  This is useful to restart a request at a different URL based
 // on the result of another job.
-class NET_API URLRequestRedirectJob : public URLRequestJob {
+class NET_EXPORT URLRequestRedirectJob : public URLRequestJob {
  public:
   // Constructs a job that redirects to the specified URL.
   URLRequestRedirectJob(URLRequest* request, const GURL& redirect_destination);
diff --git a/net/url_request/url_request_simple_job.h b/net/url_request/url_request_simple_job.h
index be574d6..dfe4ed2 100644
--- a/net/url_request/url_request_simple_job.h
+++ b/net/url_request/url_request_simple_job.h
@@ -9,14 +9,14 @@
 #include <string>
 
 #include "base/task.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/url_request/url_request_job.h"
 
 namespace net {
 
 class URLRequest;
 
-class NET_API URLRequestSimpleJob : public URLRequestJob {
+class NET_EXPORT URLRequestSimpleJob : public URLRequestJob {
  public:
   explicit URLRequestSimpleJob(URLRequest* request);
 
diff --git a/net/url_request/url_request_test_job.h b/net/url_request/url_request_test_job.h
index 80d51ce..6162b69 100644
--- a/net/url_request/url_request_test_job.h
+++ b/net/url_request/url_request_test_job.h
@@ -36,7 +36,7 @@ namespace net {
 //
 // Optionally, you can also construct test jobs that advance automatically
 // without having to call ProcessOnePendingMessage.
-class NET_TEST URLRequestTestJob : public URLRequestJob {
+class NET_EXPORT_PRIVATE URLRequestTestJob : public URLRequestJob {
  public:
   // Constructs a job to return one of the canned responses depending on the
   // request url, with auto advance disabled.
diff --git a/net/url_request/url_request_throttler_entry.h b/net/url_request/url_request_throttler_entry.h
index df03fb3..f4ad2c9 100644
--- a/net/url_request/url_request_throttler_entry.h
+++ b/net/url_request/url_request_throttler_entry.h
@@ -30,7 +30,7 @@ class URLRequestThrottlerManager;
 // destination and provide guidance (to the application level only) on whether
 // too many requests have been sent and when a good time to send the next one
 // would be. This is never used to deny requests at the network level.
-class NET_API URLRequestThrottlerEntry
+class NET_EXPORT URLRequestThrottlerEntry
     : public URLRequestThrottlerEntryInterface {
  public:
   // Sliding window period.
diff --git a/net/url_request/url_request_throttler_entry_interface.h b/net/url_request/url_request_throttler_entry_interface.h
index b09ddcc..e46cd2a 100644
--- a/net/url_request/url_request_throttler_entry_interface.h
+++ b/net/url_request/url_request_throttler_entry_interface.h
@@ -11,14 +11,14 @@
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/time.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
 class URLRequestThrottlerHeaderInterface;
 
 // Interface provided on entries of the URL request throttler manager.
-class NET_API URLRequestThrottlerEntryInterface
+class NET_EXPORT URLRequestThrottlerEntryInterface
     : public base::RefCountedThreadSafe<URLRequestThrottlerEntryInterface> {
  public:
   URLRequestThrottlerEntryInterface() {}
diff --git a/net/url_request/url_request_throttler_manager.h b/net/url_request/url_request_throttler_manager.h
index 784c569..d97e0b9 100644
--- a/net/url_request/url_request_throttler_manager.h
+++ b/net/url_request/url_request_throttler_manager.h
@@ -16,7 +16,7 @@
 #include "base/threading/non_thread_safe.h"
 #include "base/threading/platform_thread.h"
 #include "googleurl/src/gurl.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/base/network_change_notifier.h"
 #include "net/url_request/url_request_throttler_entry.h"
 
@@ -38,7 +38,7 @@ class NetLog;
 // NOTE: All usage of this singleton object must be on the same thread,
 // although to allow it to be used as a singleton, construction and destruction
 // can occur on a separate thread.
-class NET_API URLRequestThrottlerManager
+class NET_EXPORT URLRequestThrottlerManager
     : NON_EXPORTED_BASE(public base::NonThreadSafe),
       public NetworkChangeNotifier::IPAddressObserver,
       public NetworkChangeNotifier::OnlineStateObserver {
diff --git a/net/url_request/view_cache_helper.h b/net/url_request/view_cache_helper.h
index 4f8c2b5..5a67498 100644
--- a/net/url_request/view_cache_helper.h
+++ b/net/url_request/view_cache_helper.h
@@ -10,7 +10,7 @@
 
 #include "net/base/completion_callback.h"
 #include "net/base/io_buffer.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace disk_cache {
 class Backend;
@@ -21,7 +21,7 @@ namespace net {
 
 class URLRequestContext;
 
-class NET_API ViewCacheHelper {
+class NET_EXPORT ViewCacheHelper {
  public:
   ViewCacheHelper();
   ~ViewCacheHelper();
diff --git a/net/websockets/websocket_frame_handler.h b/net/websockets/websocket_frame_handler.h
index 293d43b..b06122e 100644
--- a/net/websockets/websocket_frame_handler.h
+++ b/net/websockets/websocket_frame_handler.h
@@ -11,7 +11,7 @@
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
@@ -19,7 +19,7 @@ class IOBuffer;
 class IOBufferWithSize;
 
 // Handles WebSocket frame messages.
-class NET_TEST WebSocketFrameHandler {
+class NET_EXPORT_PRIVATE WebSocketFrameHandler {
  public:
   struct FrameInfo {
     const char* frame_start;
diff --git a/net/websockets/websocket_handshake_handler.h b/net/websockets/websocket_handshake_handler.h
index 09da372..be6c13d 100644
--- a/net/websockets/websocket_handshake_handler.h
+++ b/net/websockets/websocket_handshake_handler.h
@@ -33,14 +33,14 @@
 #include <vector>
 
 #include "base/memory/ref_counted.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/http/http_request_info.h"
 #include "net/http/http_response_info.h"
 #include "net/spdy/spdy_framer.h"
 
 namespace net {
 
-class NET_TEST WebSocketHandshakeRequestHandler {
+class NET_EXPORT_PRIVATE WebSocketHandshakeRequestHandler {
  public:
   WebSocketHandshakeRequestHandler();
   ~WebSocketHandshakeRequestHandler() {}
@@ -93,7 +93,7 @@ class NET_TEST WebSocketHandshakeRequestHandler {
   DISALLOW_COPY_AND_ASSIGN(WebSocketHandshakeRequestHandler);
 };
 
-class NET_TEST WebSocketHandshakeResponseHandler {
+class NET_EXPORT_PRIVATE WebSocketHandshakeResponseHandler {
  public:
   WebSocketHandshakeResponseHandler();
   ~WebSocketHandshakeResponseHandler();
diff --git a/net/websockets/websocket_job.h b/net/websockets/websocket_job.h
index 190595e..1543f93 100644
--- a/net/websockets/websocket_job.h
+++ b/net/websockets/websocket_job.h
@@ -31,7 +31,7 @@ class WebSocketHandshakeResponseHandler;
 // see HttpOnly cookies, so it injects cookie header in handshake request and
 // strips set-cookie headers in handshake response.
 // TODO(ukai): refactor websocket.cc to use this.
-class NET_API WebSocketJob
+class NET_EXPORT WebSocketJob
     : public SocketStreamJob,
       public SocketStream::Delegate,
       public SpdyWebSocketStream::Delegate {
diff --git a/net/websockets/websocket_net_log_params.h b/net/websockets/websocket_net_log_params.h
index 8f0fc3f..7b90305 100644
--- a/net/websockets/websocket_net_log_params.h
+++ b/net/websockets/websocket_net_log_params.h
@@ -19,7 +19,7 @@
 
 namespace net {
 
-class NET_TEST NetLogWebSocketHandshakeParameter
+class NET_EXPORT_PRIVATE NetLogWebSocketHandshakeParameter
     : public NetLog::EventParameters {
  public:
   explicit NetLogWebSocketHandshakeParameter(const std::string& headers);
diff --git a/net/websockets/websocket_throttle.h b/net/websockets/websocket_throttle.h
index 2ec5146..8cafba9 100644
--- a/net/websockets/websocket_throttle.h
+++ b/net/websockets/websocket_throttle.h
@@ -10,7 +10,7 @@
 #include <string>
 
 #include "base/hash_tables.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 template <typename T> struct DefaultSingletonTraits;
 
@@ -27,7 +27,7 @@ class WebSocketJob;
 //        remote host (IP address) identified by /host/, even if known by
 //        another name, wait until that connection has been established or
 //        for that connection to have failed.
-class NET_TEST WebSocketThrottle {
+class NET_EXPORT_PRIVATE WebSocketThrottle {
  public:
   // Returns the singleton instance.
   static WebSocketThrottle* GetInstance();