Disk cache: Update Addr to handle file format version 3.

net/disk_cache/addr_unittest.cc

 // 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.
 
 #include "net/disk_cache/addr.h"
 #include "net/disk_cache/disk_cache_test_base.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace disk_cache {
 
@@ skipping 18 matching lines @@
   Addr addr3(BLOCK_4K, 0x44, 0x41508, 0x952536);
   EXPECT_EQ(BLOCK_4K, addr3.file_type());
   EXPECT_EQ(4, addr3.num_blocks());
   EXPECT_EQ(8, addr3.FileNumber());
   EXPECT_EQ(0x2536, addr3.start_block());
   EXPECT_EQ(4096, addr3.BlockSize());
 }
 
 TEST_F(DiskCacheTest, CacheAddr_SanityCheck) {
   // First a few valid values.
-  EXPECT_TRUE(Addr(0).SanityCheck());
-  EXPECT_TRUE(Addr(0x80001000).SanityCheck());
-  EXPECT_TRUE(Addr(0xC3FFFFFF).SanityCheck());
-  EXPECT_TRUE(Addr(0xC0FFFFFF).SanityCheck());
+  EXPECT_TRUE(Addr(0).SanityCheckV2());
+  EXPECT_TRUE(Addr(0x80001000).SanityCheckV2());
+  EXPECT_TRUE(Addr(0xC3FFFFFF).SanityCheckV2());
+  EXPECT_TRUE(Addr(0xC0FFFFFF).SanityCheckV2());
+  EXPECT_TRUE(Addr(0xD0001000).SanityCheckV3());
 
   // Not initialized.
-  EXPECT_FALSE(Addr(0x20).SanityCheck());
-  EXPECT_FALSE(Addr(0x10001000).SanityCheck());
+  EXPECT_FALSE(Addr(0x20).SanityCheckV2());
+  EXPECT_FALSE(Addr(0x10001000).SanityCheckV2());
 
   // Invalid file type.
-  EXPECT_FALSE(Addr(0xD0001000).SanityCheck());
-  EXPECT_FALSE(Addr(0xF0000000).SanityCheck());
+  EXPECT_FALSE(Addr(0xD0001000).SanityCheckV2());
+  EXPECT_FALSE(Addr(0xE0001000).SanityCheckV3());
+  EXPECT_FALSE(Addr(0xF0000000).SanityCheckV2());
 
   // Reserved bits.
-  EXPECT_FALSE(Addr(0x14000000).SanityCheck());
-  EXPECT_FALSE(Addr(0x18000000).SanityCheck());
+  EXPECT_FALSE(Addr(0x14000000).SanityCheckV2());
+  EXPECT_FALSE(Addr(0x18000000).SanityCheckV2());
 }
 
 }  // namespace disk_cache