Rename NET_API to NET_EXPORT, and rename NET_TEST to NET_EXPORT_PRIVATE.

net/socket/client_socket_factory.h

Index: net/socket/client_socket_factory.h
===================================================================
--- net/socket/client_socket_factory.h	(revision 95949)
+++ net/socket/client_socket_factory.h	(working copy)
@@ -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 @@
 
 // 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() {}