Rename NET_API to NET_EXPORT, and rename NET_TEST to NET_EXPORT_PRIVATE.

net/proxy/dhcp_proxy_script_adapter_fetcher_win.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_DHCP_SCRIPT_ADAPTER_FETCHER_WIN_H_
 #define NET_PROXY_DHCP_SCRIPT_ADAPTER_FETCHER_WIN_H_
 #pragma once
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/string16.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/timer.h"
 #include "net/base/completion_callback.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "googleurl/src/gurl.h"
 
 namespace base {
 class MessageLoopProxy;
 }
 
 namespace net {
 
 class ProxyScriptFetcher;
 class URLRequestContext;
 
 // For a given adapter, this class takes care of first doing a DHCP lookup
 // to get the PAC URL, then if there is one, trying to fetch it.
-class NET_TEST DhcpProxyScriptAdapterFetcher
+class NET_EXPORT_PRIVATE DhcpProxyScriptAdapterFetcher
     : public base::SupportsWeakPtr<DhcpProxyScriptAdapterFetcher>,
       NON_EXPORTED_BASE(public base::NonThreadSafe) {
  public:
   // |url_request_context| must outlive DhcpProxyScriptAdapterFetcher.
   explicit DhcpProxyScriptAdapterFetcher(
       URLRequestContext* url_request_context);
   virtual ~DhcpProxyScriptAdapterFetcher();
 
   // Starts a fetch.  On completion (but not cancellation), |callback|
   // will be invoked with the network error indicating success or failure
@@ skipping 66 matching lines @@
 
   State state() const;
 
   // This inner class is used to encapsulate the worker thread, which has
   // only a weak reference back to the main object, so that the main object
   // can be destroyed before the thread ends.  This also keeps the main
   // object completely thread safe and allows it to be non-refcounted.
   //
   // TODO(joi): Replace with PostTaskAndReply once http://crbug.com/86301
   // has been implemented.
-  class NET_TEST WorkerThread
+  class NET_EXPORT_PRIVATE WorkerThread
       : public base::RefCountedThreadSafe<WorkerThread> {
    public:
     // Creates and initializes (but does not start) the worker thread.
     explicit WorkerThread(
         const base::WeakPtr<DhcpProxyScriptAdapterFetcher>& owner);
     virtual ~WorkerThread();
 
     // Starts the worker thread, fetching information for |adapter_name| using
     // |get_pac_from_url_func|.
     void Start(const std::string& adapter_name);
@@ skipping 69 matching lines @@
   base::OneShotTimer<DhcpProxyScriptAdapterFetcher> wait_timer_;
 
   scoped_refptr<URLRequestContext> url_request_context_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(DhcpProxyScriptAdapterFetcher);
 };
 
 }  // namespace net
 
 #endif  // NET_PROXY_DHCP_SCRIPT_ADAPTER_FETCHER_WIN_H_