Rename NET_API to NET_EXPORT, and rename NET_TEST to NET_EXPORT_PRIVATE.

net/http/http_util.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_HTTP_HTTP_UTIL_H_
 #define NET_HTTP_HTTP_UTIL_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/string_tokenizer.h"
 #include "googleurl/src/gurl.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/http/http_byte_range.h"
 
 // This is a macro to support extending this string literal at compile time.
 // Please excuse me polluting your global namespace!
 #define HTTP_LWS " \t"
 
 namespace net {
 
 class UploadDataStream;
 
-class NET_API HttpUtil {
+class NET_EXPORT HttpUtil {
  public:
   // Returns the absolute path of the URL, to be used for the http request.
   // The absolute path starts with a '/' and may contain a query.
   static std::string PathForRequest(const GURL& url);
 
   // Returns the absolute URL, to be used for the http request. This url is
   // made up of the protocol, host, [port], path, [query]. Everything else
   // is stripped (username, password, reference).
   static std::string SpecForRequest(const GURL& url);
 
@@ skipping 127 matching lines @@
   // Helper. If |*headers| already contains |header_name| do nothing,
   // otherwise add <header_name> ": " <header_value> to the end of the list.
   static void AppendHeaderIfMissing(const char* header_name,
                                     const std::string& header_value,
                                     std::string* headers);
 
   // Used to iterate over the name/value pairs of HTTP headers.  To iterate
   // over the values in a multi-value header, use ValuesIterator.
   // See AssembleRawHeaders for joining line continuations (this iterator
   // does not expect any).
-  class NET_API HeadersIterator {
+  class NET_EXPORT HeadersIterator {
    public:
     HeadersIterator(std::string::const_iterator headers_begin,
                     std::string::const_iterator headers_end,
                     const std::string& line_delimiter);
     ~HeadersIterator();
 
     // Advances the iterator to the next header, if any.  Returns true if there
     // is a next header.  Use name* and values* methods to access the resultant
     // header name and values.
     bool GetNext();
@@ skipping 42 matching lines @@
   // automatically trimmed from the resulting values.
   //
   // When using this class to iterate over response header values, be aware that
   // for some headers (e.g., Last-Modified), commas are not used as delimiters.
   // This iterator should be avoided for headers like that which are considered
   // non-coalescing (see IsNonCoalescingHeader).
   //
   // This iterator is careful to skip over delimiters found inside an HTTP
   // quoted string.
   //
-  class NET_TEST ValuesIterator {
+  class NET_EXPORT_PRIVATE ValuesIterator {
    public:
     ValuesIterator(std::string::const_iterator values_begin,
                    std::string::const_iterator values_end,
                    char delimiter);
     ~ValuesIterator();
 
     // Advances the iterator to the next value, if any.  Returns true if there
     // is a next value.  Use value* methods to access the resultant value.
     bool GetNext();
 
@@ skipping 13 matching lines @@
     std::string::const_iterator value_end_;
   };
 
   // Iterates over a delimited sequence of name-value pairs in an HTTP header.
   // Each pair consists of a token (the name), an equals sign, and either a
   // token or quoted-string (the value). Arbitrary HTTP LWS is permitted outside
   // of and between names, values, and delimiters.
   //
   // String iterators returned from this class' methods may be invalidated upon
   // calls to GetNext() or after the NameValuePairsIterator is destroyed.
-  class NET_API NameValuePairsIterator {
+  class NET_EXPORT NameValuePairsIterator {
    public:
     NameValuePairsIterator(std::string::const_iterator begin,
                            std::string::const_iterator end,
                            char delimiter);
     ~NameValuePairsIterator();
 
     // Advances the iterator to the next pair, if any.  Returns true if there
     // is a next pair.  Use name* and value* methods to access the resultant
     // value.
     bool GetNext();
@@ skipping 36 matching lines @@
     // into the original's unquoted_value_ member.
     std::string unquoted_value_;
 
     bool value_is_quoted_;
   };
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_UTIL_H_