diff options
| author | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-30 16:40:10 +0000 |
|---|---|---|
| committer | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-30 16:40:10 +0000 |
| commit | a9bb6f69b32018c245e05a79011114653fe8f5e0 (patch) | |
| tree | c4fe6b5db0e508f860c82feb44245bf549d608ff /chrome/browser/safe_browsing | |
| parent | f23423a1245dffc2a368708fafd2867d2cf3e0f8 (diff) | |
| download | chromium_src-a9bb6f69b32018c245e05a79011114653fe8f5e0.zip chromium_src-a9bb6f69b32018c245e05a79011114653fe8f5e0.tar.gz chromium_src-a9bb6f69b32018c245e05a79011114653fe8f5e0.tar.bz2 | |
Move some more classes from net/base into the net:: namespace.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/safe_browsing')
| -rw-r--r-- | chrome/browser/safe_browsing/protocol_manager.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/safe_browsing/safe_browsing_util.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/safe_browsing/protocol_manager.cc b/chrome/browser/safe_browsing/protocol_manager.cc index 086ceb9..9307cd3 100644 --- a/chrome/browser/safe_browsing/protocol_manager.cc +++ b/chrome/browser/safe_browsing/protocol_manager.cc @@ -364,7 +364,7 @@ bool SafeBrowsingProtocolManager::HandleServiceResponse(const GURL& url, std::string data_str; data_str.assign(data, length); std::string encoded_chunk; - Base64Encode(data, &encoded_chunk); + net::Base64Encode(data, &encoded_chunk); SB_DLOG(INFO) << "ParseChunk error for chunk: " << chunk_url.url << ", client_key: " << client_key_ << ", wrapped_key: " << wrapped_key_ diff --git a/chrome/browser/safe_browsing/safe_browsing_util.cc b/chrome/browser/safe_browsing/safe_browsing_util.cc index 802d5ff..304a637 100644 --- a/chrome/browser/safe_browsing/safe_browsing_util.cc +++ b/chrome/browser/safe_browsing/safe_browsing_util.cc @@ -165,12 +165,12 @@ bool VerifyMAC(const std::string& key, const std::string& mac, std::string key_copy = key; DecodeWebSafe(&key_copy); std::string decoded_key; - Base64Decode(key_copy, &decoded_key); + net::Base64Decode(key_copy, &decoded_key); std::string mac_copy = mac; DecodeWebSafe(&mac_copy); std::string decoded_mac; - Base64Decode(mac_copy, &decoded_mac); + net::Base64Decode(mac_copy, &decoded_mac); HMAC hmac(HMAC::SHA1, reinterpret_cast<const unsigned char*>(decoded_key.data()), |