Merge r7710...

chrome/browser/safe_browsing/safe_browsing_database_bloom.h

Index: chrome/browser/safe_browsing/safe_browsing_database_bloom.h
===================================================================
--- chrome/browser/safe_browsing/safe_browsing_database_bloom.h	(revision 8470)
+++ chrome/browser/safe_browsing/safe_browsing_database_bloom.h	(working copy)
@@ -111,15 +111,6 @@
   // 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();
 
Property changes on: chrome\browser\safe_browsing\safe_browsing_database_bloom.h
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/safe_browsing/safe_browsing_database_bloom.h:r7710,7942,8290