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

5 files changed, 9 insertions, 9 deletions

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();