Separate the initialization code in the constructor of HMAC class into Init f...

chrome/browser/safe_browsing/safe_browsing_util.cc

 // 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.
 
 #include "chrome/browser/safe_browsing/safe_browsing_util.h"
 
 #include "base/hmac.h"
 #include "base/logging.h"
 #include "base/sha2.h"
 #include "base/string_util.h"
@@ skipping 152 matching lines @@
   std::string key_copy = key;
   DecodeWebSafe(&key_copy);
   std::string decoded_key;
   net::Base64Decode(key_copy, &decoded_key);
 
   std::string mac_copy = mac;
   DecodeWebSafe(&mac_copy);
   std::string decoded_mac;
   net::Base64Decode(mac_copy, &decoded_mac);
 
-  base::HMAC hmac(base::HMAC::SHA1,
-                  reinterpret_cast<const unsigned char*>(decoded_key.data()),
-                  static_cast<int>(decoded_key.length()));
+  base::HMAC hmac(base::HMAC::SHA1);
+  if (!hmac.Init(decoded_key))
+    return false;
   const std::string data_str(data, data_length);
   unsigned char digest[kSafeBrowsingMacDigestSize];
   if (!hmac.Sign(data_str, digest, kSafeBrowsingMacDigestSize))
     return false;
 
   return memcmp(digest, decoded_mac.data(), kSafeBrowsingMacDigestSize) == 0;
 }
 
 void FreeChunks(std::deque<SBChunk>* chunks) {
   while (!chunks->empty()) {
@@ skipping 444 matching lines @@
 
   // Validate that the next entry is wholly contained inside of |data_|.
   const char* end = data_.get() + size_;
   if (next + SBEntry::kMinSize <= end && next + next_entry->Size() <= end) {
     *entry = next_entry;
     return true;
   }
 
   return false;
 }