Rename NET_API to NET_EXPORT, and rename NET_TEST to NET_EXPORT_PRIVATE.

net/base/dnsrr_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_BASE_DNSRR_RESOLVER_H_
 #define NET_BASE_DNSRR_RESOLVER_H_
 #pragma once
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/time.h"
 #include "build/build_config.h"
 #include "net/base/completion_callback.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/base/network_change_notifier.h"
 
 namespace net {
 
 // RRResponse contains the result of a successful request for a resource record.
-struct NET_TEST RRResponse {
+struct NET_EXPORT_PRIVATE RRResponse {
   RRResponse();
   ~RRResponse();
 
   // HasExpired returns true if |fetch_time| + |ttl| is less than
   // |current_time|.
   bool HasExpired(base::Time current_time) const;
 
   // For testing only
   bool ParseFromResponse(const uint8* data, unsigned len,
                          uint16 rrtype_requested);
@@ skipping 23 matching lines @@
 // DnsRRResolver resolves arbitary DNS resource record types. It should not be
 // confused with HostResolver and should not be used to resolve A/AAAA records.
 //
 // HostResolver exists to lookup addresses and there are many details about
 // address resolution over and above DNS (i.e. Bonjour, VPNs etc).
 //
 // DnsRRResolver should only be used when the data is specifically DNS data and
 // the name is a fully qualified DNS domain.
 //
 // A DnsRRResolver must be used from the MessageLoop which created it.
-class NET_API DnsRRResolver : NON_EXPORTED_BASE(public base::NonThreadSafe),
-                              public NetworkChangeNotifier::IPAddressObserver {
+class NET_EXPORT DnsRRResolver
+    : NON_EXPORTED_BASE(public base::NonThreadSafe),
+      public NetworkChangeNotifier::IPAddressObserver {
  public:
   typedef intptr_t Handle;
 
   enum {
     kInvalidHandle = 0,
   };
 
   enum {
     // Try harder to get a DNSSEC signed response. This doesn't mean that the
     // RRResponse will always have the dnssec bit set.
@@ skipping 46 matching lines @@
   uint64 inflight_joins_;
 
   bool in_destructor_;
 
   DISALLOW_COPY_AND_ASSIGN(DnsRRResolver);
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_DNSRR_RESOLVER_H_