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

Unified Diff: net/base/net_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 | « net/base/data_url.cc ('k') | net/base/sdch_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/net_util.cc
diff --git a/net/base/net_util.cc b/net/base/net_util.cc
index af090bdb65c51cf3dc58813ec48d776de4b16221..2677abd665fd682d5bef51c201489931b2e004be 100644
--- a/net/base/net_util.cc
+++ b/net/base/net_util.cc
@@ -26,6 +26,7 @@
#include <fcntl.h>
#endif
+#include "base/base64.h"
#include "base/basictypes.h"
#include "base/file_path.h"
#include "base/file_util.h"
@@ -54,7 +55,6 @@
#if defined(OS_WIN)
#include "net/base/winsock_init.h"
#endif
-#include "net/base/base64.h"
#include "unicode/datefmt.h"
@@ -225,7 +225,7 @@ bool DecodeBQEncoding(const std::string& part, RFC2047EncodingType enc_type,
const std::string& charset, std::string* output) {
std::string decoded;
if (enc_type == B_ENCODING) {
- if (!net::Base64Decode(part, &decoded)) {
+ if (!base::Base64Decode(part, &decoded)) {
return false;
}
} else {
« no previous file with comments | « net/base/data_url.cc ('k') | net/base/sdch_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698