Revert of Simple: Move PVer4 related code from util.* to v4_protocol_manager_util.*

components/safe_browsing_db/v4_store.h

Index: components/safe_browsing_db/v4_store.h
diff --git a/components/safe_browsing_db/v4_store.h b/components/safe_browsing_db/v4_store.h
index 770088b5938a117ea71dd72fa17c3b45a573cbd4..94621e5281cac0682e505c695513c4090bfb7b22 100644
--- a/components/safe_browsing_db/v4_store.h
+++ b/components/safe_browsing_db/v4_store.h
@@ -22,6 +22,9 @@
 // hash).
 typedef size_t PrefixSize;
 
+// A hash prefix sent by the SafeBrowsing PVer4 service.
+typedef std::string HashPrefix;
+
 // The sorted list of hash prefixes.
 typedef std::string HashPrefixes;
 
@@ -34,6 +37,9 @@
 // For instance: {4:iter(3), 5:iter(1)} means that we have already merged
 // 3 hash prefixes of length 4, and 1 hash prefix of length 5.
 typedef base::hash_map<PrefixSize, HashPrefixes::const_iterator> IteratorMap;
+
+// A full SHA256 hash.
+typedef HashPrefix FullHash;
 
 // Enumerate different failure events while parsing the file read from disk for
 // histogramming purposes.  DO NOT CHANGE THE ORDERING OF THESE VALUES.