Small modifications to safebrowsing code to make it simpler to add the extension

chrome/browser/safe_browsing/safe_browsing_util_unittest.cc

 // Copyright (c) 2011 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 <algorithm>
 
 #include "base/stringprintf.h"
 #include "crypto/sha2.h"
 #include "chrome/browser/safe_browsing/safe_browsing_util.h"
 #include "googleurl/src/gurl.h"
@@ skipping 320 matching lines @@
 TEST(SafeBrowsingUtilTest, ListIdVerification) {
   EXPECT_EQ(0, safe_browsing_util::MALWARE % 2);
   EXPECT_EQ(1, safe_browsing_util::PHISH % 2);
   EXPECT_EQ(0, safe_browsing_util::BINURL %2);
   EXPECT_EQ(1, safe_browsing_util::BINHASH % 2);
 }
 
 TEST(SafeBrowsingUtilTest, StringToSBFullHashAndSBFullHashToString) {
   // 31 chars plus the last \0 as full_hash.
   const std::string hash_in = "12345678902234567890323456789012";
-  SBFullHash hash_out;
-  safe_browsing_util::StringToSBFullHash(hash_in, &hash_out);
+  SBFullHash hash_out = safe_browsing_util::StringToSBFullHash(hash_in);
   EXPECT_EQ(0x34333231, hash_out.prefix);
   EXPECT_EQ(0, memcmp(hash_in.data(), hash_out.full_hash, sizeof(SBFullHash)));
 
   std::string hash_final = safe_browsing_util::SBFullHashToString(hash_out);
   EXPECT_EQ(hash_in, hash_final);
 }