Safebrowsing: change gethash caching to match api 2.3 rules, fix some corner cases.

chrome/browser/safe_browsing/protocol_parser_unittest.cc

 // Copyright (c) 2012 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.
 //
 // Program to test the SafeBrowsing protocol parsing v2.1.
 
 #include <map>
 #include <string>
 
 #include "base/strings/stringprintf.h"
@@ skipping 471 matching lines @@
   std::vector<SBFullHashResult> full_hashes;
   SafeBrowsingProtocolParser parser;
   EXPECT_TRUE(parser.ParseGetHash(hash_response.data(),
                                   hash_response.size(),
                                   &full_hashes));
 
   EXPECT_EQ(full_hashes.size(), 1U);
   EXPECT_EQ(memcmp("12345678901234567890123456789012",
                    &full_hashes[0].hash, sizeof(SBFullHash)), 0);
   EXPECT_EQ(full_hashes[0].list_name, "goog-phish-shavar");
-  EXPECT_EQ(full_hashes[0].add_chunk_id, 1);
 
   hash_response += "goog-malware-shavar:7:32\n"
                    "abcdefghijklmnopqrstuvwxyz123457";
   full_hashes.clear();
   EXPECT_TRUE(parser.ParseGetHash(hash_response.data(),
                                   hash_response.size(),
                                   &full_hashes));
 
   EXPECT_EQ(full_hashes.size(), 2U);
   EXPECT_EQ(memcmp("12345678901234567890123456789012",
                    &full_hashes[0].hash, sizeof(SBFullHash)), 0);
   EXPECT_EQ(full_hashes[0].list_name, "goog-phish-shavar");
-  EXPECT_EQ(full_hashes[0].add_chunk_id, 1);
   EXPECT_EQ(memcmp("abcdefghijklmnopqrstuvwxyz123457",
                    &full_hashes[1].hash, sizeof(SBFullHash)), 0);
   EXPECT_EQ(full_hashes[1].list_name, "goog-malware-shavar");
-  EXPECT_EQ(full_hashes[1].add_chunk_id, 7);
 }
 
 TEST(SafeBrowsingProtocolParsingTest, TestFormatHash) {
   SafeBrowsingProtocolParser parser;
   std::vector<SBPrefix> prefixes;
   std::string get_hash;
 
   prefixes.push_back(0x34333231);
   prefixes.push_back(0x64636261);
   prefixes.push_back(0x73727170);
@@ skipping 360 matching lines @@
                                     chunk_data.data(),
                                     static_cast<int>(chunk_data.length()),
                                     &chunks))
           << "Unable to parse sub chunk data for listname: "
           << listname;
       ASSERT_EQ(chunks.size(), 1U);
       EXPECT_FALSE(chunks[0].is_add);
     }
   }
 }