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

11 files changed, 25 insertions, 23 deletions

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