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/extensions/convert_user_script.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/extensions/convert_user_script.cc')
| -rw-r--r-- | chrome/browser/extensions/convert_user_script.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/convert_user_script.cc b/chrome/browser/extensions/convert_user_script.cc index 1f5d027..814d17f 100644 --- a/chrome/browser/extensions/convert_user_script.cc +++ b/chrome/browser/extensions/convert_user_script.cc @@ -7,6 +7,7 @@ #include <string> #include <vector> +#include "base/base64.h" #include "base/file_path.h" #include "base/file_util.h" #include "base/scoped_temp_dir.h" @@ -18,7 +19,6 @@ #include "chrome/common/extensions/user_script.h" #include "chrome/common/json_value_serializer.h" #include "googleurl/src/gurl.h" -#include "net/base/base64.h" namespace keys = extension_manifest_keys; @@ -62,7 +62,7 @@ Extension* ConvertUserScriptToExtension(const FilePath& user_script_path, char raw[base::SHA256_LENGTH] = {0}; std::string key; base::SHA256HashString(script_name, raw, base::SHA256_LENGTH); - net::Base64Encode(std::string(raw, base::SHA256_LENGTH), &key); + base::Base64Encode(std::string(raw, base::SHA256_LENGTH), &key); // The script may not have a name field, but we need one for an extension. If // it is missing, use the filename of the original URL. |