diff options
| author | hayato@chromium.org <hayato@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-24 06:21:53 +0000 |
|---|---|---|
| committer | hayato@chromium.org <hayato@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-24 06:21:53 +0000 |
| commit | 978df34538607d50bf4690f2d679c1bef860398c (patch) | |
| tree | b99abc0b44316c0bfa16374746996ac209e363a6 /chrome/browser/safe_browsing/protocol_manager.cc | |
| parent | 391bbb3fb3fbb0fb7d072878b9cb45e99a519e6e (diff) | |
| download | chromium_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 'chrome/browser/safe_browsing/protocol_manager.cc')
| -rw-r--r-- | chrome/browser/safe_browsing/protocol_manager.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/safe_browsing/protocol_manager.cc b/chrome/browser/safe_browsing/protocol_manager.cc index b11265f..e27b46b 100644 --- a/chrome/browser/safe_browsing/protocol_manager.cc +++ b/chrome/browser/safe_browsing/protocol_manager.cc @@ -4,6 +4,7 @@ #include "chrome/browser/safe_browsing/protocol_manager.h" +#include "base/base64.h" #include "base/file_version_info.h" #include "base/histogram.h" #include "base/logging.h" @@ -19,7 +20,6 @@ #include "chrome/browser/safe_browsing/protocol_parser.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/common/env_vars.h" -#include "net/base/base64.h" #include "net/base/escape.h" #include "net/base/load_flags.h" @@ -386,7 +386,7 @@ bool SafeBrowsingProtocolManager::HandleServiceResponse(const GURL& url, std::string data_str; data_str.assign(data, length); std::string encoded_chunk; - net::Base64Encode(data, &encoded_chunk); + base::Base64Encode(data, &encoded_chunk); SB_DLOG(INFO) << "ParseChunk error for chunk: " << chunk_url.url << ", client_key: " << client_key_ << ", wrapped_key: " << wrapped_key_ |