Rename NET_API to NET_EXPORT, and rename NET_TEST to NET_EXPORT_PRIVATE.

net/disk_cache/addr.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.
 
 // This is an internal class that handles the address of a cache record.
 // See net/disk_cache/disk_cache.h for the public interface of the cache.
 
 #ifndef NET_DISK_CACHE_ADDR_H_
 #define NET_DISK_CACHE_ADDR_H_
 #pragma once
 
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 #include "net/disk_cache/disk_format.h"
 
 namespace disk_cache {
 
 enum FileType {
   EXTERNAL = 0,
   RANKINGS = 1,
   BLOCK_256,
   BLOCK_1K,
   BLOCK_4K,
@@ skipping 18 matching lines @@
 //   4 = 4k byte block file
 //
 // If separate file:
 //   0000 1111 1111 1111 1111 1111 1111 1111 : file#  0 - 268,435,456 (2^28)
 //
 // If block file:
 //   0000 1100 0000 0000 0000 0000 0000 0000 : reserved bits
 //   0000 0011 0000 0000 0000 0000 0000 0000 : number of contiguous blocks 1-4
 //   0000 0000 1111 1111 0000 0000 0000 0000 : file selector 0 - 255
 //   0000 0000 0000 0000 1111 1111 1111 1111 : block#  0 - 65,535 (2^16)
-class NET_TEST Addr {
+class NET_EXPORT_PRIVATE Addr {
  public:
   Addr() : value_(0) {}
   explicit Addr(CacheAddr address) : value_(address) {}
   Addr(FileType file_type, int max_blocks, int block_file, int index) {
     value_ = ((file_type << kFileTypeOffset) & kFileTypeMask) |
              (((max_blocks - 1) << kNumBlocksOffset) & kNumBlocksMask) |
              ((block_file << kFileSelectorOffset) & kFileSelectorMask) |
              (index  & kStartBlockMask) | kInitializedMask;
   }
 
@@ skipping 71 matching lines @@
   static const uint32 kFileSelectorOffset = 16;
   static const uint32 kStartBlockMask     = 0x0000FFFF;
   static const uint32 kFileNameMask       = 0x0FFFFFFF;
 
   CacheAddr value_;
 };
 
 }  // namespace disk_cache
 
 #endif  // NET_DISK_CACHE_ADDR_H_