Rename NET_API to NET_EXPORT, and rename NET_TEST to NET_EXPORT_PRIVATE.

net/socket/client_socket_pool_manager.h

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