summaryrefslogtreecommitdiffstats
path: root/net/base/net_util.cc
diff options
context:
space:
mode:
authorhayato@chromium.org <hayato@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-24 06:21:53 +0000
committerhayato@chromium.org <hayato@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-24 06:21:53 +0000
commit978df34538607d50bf4690f2d679c1bef860398c (patch)
treeb99abc0b44316c0bfa16374746996ac209e363a6 /net/base/net_util.cc
parent391bbb3fb3fbb0fb7d072878b9cb45e99a519e6e (diff)
downloadchromium_src-978df34538607d50bf4690f2d679c1bef860398c.zip
chromium_src-978df34538607d50bf4690f2d679c1bef860398c.tar.gz
chromium_src-978df34538607d50bf4690f2d679c1bef860398c.tar.bz2
Move base64 from 'net/base' into 'base'.
BUG=13572 TEST=none Review URL: http://codereview.chromium.org/399068 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32918 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/net_util.cc')
-rw-r--r--net/base/net_util.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/base/net_util.cc b/net/base/net_util.cc
index af090bd..2677abd 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 {