Rename NET_API to NET_EXPORT, and rename NET_TEST to NET_EXPORT_PRIVATE.

net/proxy/proxy_server.h

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