Reduce the amount of included header files. Vast change like in "Oh God! This...

net/disk_cache/addr.h

 // Copyright (c) 2006-2008 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__
+#ifndef NET_DISK_CACHE_ADDR_H_
+#define NET_DISK_CACHE_ADDR_H_
 
-#include "base/basictypes.h"
-#include "base/logging.h"
 #include "net/disk_cache/disk_format.h"
 
 namespace disk_cache {
 
 enum FileType {
   EXTERNAL = 0,
   RANKINGS = 1,
   BLOCK_256,
   BLOCK_1K,
   BLOCK_4K,
@@ skipping 57 matching lines @@
     return static_cast<FileType>((value_ & kFileTypeMask) >> kFileTypeOffset);
   }
 
   int FileNumber() const {
     if (is_separate_file())
       return value_ & kFileNameMask;
     else
       return ((value_ & kFileSelectorMask) >> kFileSelectorOffset);
   }
 
-  int start_block() const {
-    DCHECK(is_block_file());
-    return value_ & kStartBlockMask;
-  }
-
-  int num_blocks() const {
-    DCHECK(is_block_file() || !value_);
-    return ((value_ & kNumBlocksMask) >> kNumBlocksOffset) + 1;
-  }
-
-  bool SetFileNumber(int file_number) {
-    DCHECK(is_separate_file());
-    if (file_number & ~kFileNameMask)
-      return false;
-    value_ = kInitializedMask | file_number;
-    return true;
-  }
-
+  int start_block() const;
+  int num_blocks() const;
+  bool SetFileNumber(int file_number);
   int BlockSize() const {
     return BlockSizeForFileType(file_type());
   }
 
   static int BlockSizeForFileType(FileType file_type) {
     switch (file_type) {
       case RANKINGS:
         return 36;
       case BLOCK_256:
         return 256;
@@ skipping 26 matching lines @@
   static const uint32 kFileSelectorMask   = 0x00ff0000;
   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__
-
+#endif  // NET_DISK_CACHE_ADDR_H_