Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1439)

Unified Diff: chrome/browser/safe_browsing/safe_browsing_util.cc

Issue 399068: Move base64 from 'net/base' into 'base'. (Closed)
Patch Set: rebase Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/safe_browsing/protocol_manager.cc ('k') | chrome/common/extensions/extension.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/safe_browsing/safe_browsing_util.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_util.cc b/chrome/browser/safe_browsing/safe_browsing_util.cc
index 089c4907abe493cb40f297e61473a09aed98fd82..4ee55292aa45631feb87fe0221cbd88c4347bc15 100644
--- a/chrome/browser/safe_browsing/safe_browsing_util.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_util.cc
@@ -4,13 +4,13 @@
#include "chrome/browser/safe_browsing/safe_browsing_util.h"
+#include "base/base64.h"
#include "base/hmac.h"
#include "base/logging.h"
#include "base/sha2.h"
#include "base/string_util.h"
#include "chrome/browser/google_util.h"
#include "googleurl/src/gurl.h"
-#include "net/base/base64.h"
#include "net/base/escape.h"
#include "unicode/locid.h"
@@ -163,12 +163,12 @@ bool VerifyMAC(const std::string& key, const std::string& mac,
std::string key_copy = key;
DecodeWebSafe(&key_copy);
std::string decoded_key;
- net::Base64Decode(key_copy, &decoded_key);
+ base::Base64Decode(key_copy, &decoded_key);
std::string mac_copy = mac;
DecodeWebSafe(&mac_copy);
std::string decoded_mac;
- net::Base64Decode(mac_copy, &decoded_mac);
+ base::Base64Decode(mac_copy, &decoded_mac);
base::HMAC hmac(base::HMAC::SHA1);
if (!hmac.Init(decoded_key))
« no previous file with comments | « chrome/browser/safe_browsing/protocol_manager.cc ('k') | chrome/common/extensions/extension.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698