diff options
| author | vadimt@chromium.org <vadimt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-11 00:03:33 +0000 |
|---|---|---|
| committer | vadimt@chromium.org <vadimt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-11 00:03:33 +0000 |
| commit | 1d4b7c7ca38a12faaf5b8878428f57b4896c1496 (patch) | |
| tree | 0292489017b8ce80fab92daf4dafe2f4a54fbd3e /components/policy | |
| parent | 9a07c2959da5398a6dd9176e1bbf31f6ab6dc89a (diff) | |
| download | chromium_src-1d4b7c7ca38a12faaf5b8878428f57b4896c1496.zip chromium_src-1d4b7c7ca38a12faaf5b8878428f57b4896c1496.tar.gz chromium_src-1d4b7c7ca38a12faaf5b8878428f57b4896c1496.tar.bz2 | |
Revert 239759 "The comment in base64.h implies that base::Base64..."
> The comment in base64.h implies that base::Base64Encode() can return false, but
> this cannot happen in practice. Fix the comment.
>
> The implementation of Base64Encode() attempts to check for the return value
> MODP_B64_ERROR as a failure, but modp_b64_encode() cannot return this
> value. Remove the check.
>
> Remove unneeded integer cast.
>
> Change the return type to void.
>
> BUG=323357
> TEST=base_unittests, compile all
> TBR=jochen@chromium.org,miket@chromium.org,joi@chromium.org,akalin@chromium.org,sergeyu@chromium.org
>
> Review URL: https://codereview.chromium.org/86913002
TBR=ricea@chromium.org
Review URL: https://codereview.chromium.org/101113004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239921 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/policy')
| -rw-r--r-- | components/policy/core/common/cloud/resource_cache.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/components/policy/core/common/cloud/resource_cache.cc b/components/policy/core/common/cloud/resource_cache.cc index 7b9e327..e527679 100644 --- a/components/policy/core/common/cloud/resource_cache.cc +++ b/components/policy/core/common/cloud/resource_cache.cc @@ -21,9 +21,8 @@ namespace { // which is safe to use as a file name on all platforms. bool Base64Encode(const std::string& value, std::string* encoded) { DCHECK(!value.empty()); - if (value.empty()) + if (value.empty() || !base::Base64Encode(value, encoded)) return false; - base::Base64Encode(value, encoded); base::ReplaceChars(*encoded, "+", "-", encoded); base::ReplaceChars(*encoded, "/", "_", encoded); return true; |