Merge r7710...

chrome/browser/safe_browsing/safe_browsing_database_bloom.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.
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_DATABASE_BLOOM_H_
 #define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_DATABASE_BLOOM_H_
 
 #include <deque>
 #include <list>
 #include <queue>
@@ skipping 93 matching lines @@
     SUB_CHUNK = 1,
   };
 
   // Checks if a chunk is in the database.
   bool ChunkExists(int list_id, ChunkType type, int chunk_id);
 
   // Return a comma separated list of chunk ids that are in the database for
   // the given list and chunk type.
   void GetChunkIds(int list_id, ChunkType type, std::string* list);
 
-  // Converts between the SafeBrowsing list names and their enumerated value.
-  // If the list names change, both of these methods must be updated.
-  enum ListType {
-    MALWARE = 0,
-    PHISH = 1,
-  };
-  static int GetListId(const std::string& name);
-  static std::string GetListName(int list_id);
-
   // Generate a bloom filter.
   virtual void BuildBloomFilter();
 
   // Helpers for building the bloom filter.
   typedef struct {
     int chunk_id;
     SBPrefix prefix;
   } SBPair;
 
   static int PairCompare(const void* arg1, const void* arg2);
@@ skipping 124 matching lines @@
   // Lock for protecting access to the bloom filter and hash cache.
   Lock lookup_lock_;
 
   // A store for GetHash results that have not yet been written to the database.
   HashList pending_full_hashes_;
 
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingDatabaseBloom);
 };
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_DATABASE_BLOOM_H_