diff options
| author | ricea@chromium.org <ricea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-10 11:55:10 +0000 |
|---|---|---|
| committer | ricea@chromium.org <ricea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-10 11:55:10 +0000 |
| commit | 0553072d237ad2b977e948591de3f87eee536a9c (patch) | |
| tree | 58b462d22b2342db07c041ac8abaf061e671d1e5 /sync/internal_api | |
| parent | 9377d2ad77c6d7ee0190c90544eaed0ff0c7fc9c (diff) | |
| download | chromium_src-0553072d237ad2b977e948591de3f87eee536a9c.zip chromium_src-0553072d237ad2b977e948591de3f87eee536a9c.tar.gz chromium_src-0553072d237ad2b977e948591de3f87eee536a9c.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239759 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/internal_api')
| -rw-r--r-- | sync/internal_api/public/base/unique_position_unittest.cc | 2 | ||||
| -rw-r--r-- | sync/internal_api/sync_encryption_handler_impl.cc | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sync/internal_api/public/base/unique_position_unittest.cc b/sync/internal_api/public/base/unique_position_unittest.cc index 371874a..4c0a660 100644 --- a/sync/internal_api/public/base/unique_position_unittest.cc +++ b/sync/internal_api/public/base/unique_position_unittest.cc @@ -392,7 +392,7 @@ class SuffixGenerator { // random anyway. std::string input = cache_guid_ + base::Int64ToString(next_id_--); std::string output; - CHECK(base::Base64Encode(base::SHA1HashString(input), &output)); + base::Base64Encode(base::SHA1HashString(input), &output); return output; } diff --git a/sync/internal_api/sync_encryption_handler_impl.cc b/sync/internal_api/sync_encryption_handler_impl.cc index e468e6c..34bf0335 100644 --- a/sync/internal_api/sync_encryption_handler_impl.cc +++ b/sync/internal_api/sync_encryption_handler_impl.cc @@ -692,8 +692,7 @@ bool SyncEncryptionHandlerImpl::SetKeystoreKeys( // Note: in order to Pack the keys, they must all be base64 encoded (else // JSON serialization fails). - if (!base::Base64Encode(raw_keystore_key, &keystore_key_)) - return false; + base::Base64Encode(raw_keystore_key, &keystore_key_); // Go through and save the old keystore keys. We always persist all keystore // keys the server sends us. |