summaryrefslogtreecommitdiffstats
path: root/net/base/sdch_manager.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/sdch_manager.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/sdch_manager.cc')
-rw-r--r--net/base/sdch_manager.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/base/sdch_manager.cc b/net/base/sdch_manager.cc
index e617ea3..b30a171 100644
--- a/net/base/sdch_manager.cc
+++ b/net/base/sdch_manager.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/base64.h"
#include "base/field_trial.h"
#include "base/histogram.h"
#include "base/logging.h"
#include "base/sha2.h"
#include "base/string_util.h"
-#include "net/base/base64.h"
#include "net/base/registry_controlled_domain.h"
#include "net/base/sdch_manager.h"
#include "net/url_request/url_request_http_job.h"
@@ -349,7 +349,7 @@ void SdchManager::UrlSafeBase64Encode(const std::string& input,
std::string* output) {
// Since this is only done during a dictionary load, and hashes are only 8
// characters, we just do the simple fixup, rather than rewriting the encoder.
- net::Base64Encode(input, output);
+ base::Base64Encode(input, output);
for (size_t i = 0; i < output->size(); ++i) {
switch (output->data()[i]) {
case '+':