Rename NET_API to NET_EXPORT, and rename NET_TEST to NET_EXPORT_PRIVATE.

net/proxy/init_proxy_resolver.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_PROXY_INIT_PROXY_RESOLVER_H_
 #define NET_PROXY_INIT_PROXY_RESOLVER_H_
 #pragma once
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/completion_callback.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/base/net_log.h"
 
 namespace net {
 
 class DhcpProxyScriptFetcher;
 class NetLogParameter;
 class ProxyConfig;
 class ProxyResolver;
 class ProxyScriptFetcher;
 class URLRequestContext;
 
 // InitProxyResolver is a helper class used by ProxyService to
 // initialize a ProxyResolver with the PAC script data specified
 // by a particular ProxyConfig.
 //
 // This involves trying to use PAC scripts in this order:
 //
 //   (1) WPAD (DNS) if auto-detect is on.
 //   (2) Custom PAC script if a URL was given.
 //
 // If no PAC script was successfully downloaded + parsed, then it fails with
 // a network error. Otherwise the proxy resolver is left initialized with
 // the PAC script.
 //
 // Deleting InitProxyResolver while Init() is in progress, will
 // cancel the request.
 //
-class NET_TEST InitProxyResolver {
+class NET_EXPORT_PRIVATE InitProxyResolver {
  public:
   // |resolver|, |proxy_script_fetcher|, |dhcp_proxy_script_fetcher| and
   // |net_log| must remain valid for the lifespan of InitProxyResolver.
   InitProxyResolver(ProxyResolver* resolver,
                     ProxyScriptFetcher* proxy_script_fetcher,
                     DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher,
                     NetLog* net_log);
 
   // Aborts any in-progress request.
   ~InitProxyResolver();
@@ skipping 102 matching lines @@
   base::OneShotTimer<InitProxyResolver> wait_timer_;
 
   ProxyConfig* effective_config_;
 
   DISALLOW_COPY_AND_ASSIGN(InitProxyResolver);
 };
 
 }  // namespace net
 
 #endif  // NET_PROXY_INIT_PROXY_RESOLVER_H_