summaryrefslogtreecommitdiffstats
path: root/sync/internal_api/public
diff options
context:
space:
mode:
authorvadimt@chromium.org <vadimt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-11 01:48:50 +0000
committervadimt@chromium.org <vadimt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-11 01:48:50 +0000
commit33fca12d265b8129e6cff8fc1fc9ad7b34a19bab (patch)
treeef737a2c12192c512ea7e05460c758e42200590a /sync/internal_api/public
parent5cddcd140cbe8fc9a8e10e67142cee75dc99684b (diff)
downloadchromium_src-33fca12d265b8129e6cff8fc1fc9ad7b34a19bab.zip
chromium_src-33fca12d265b8129e6cff8fc1fc9ad7b34a19bab.tar.gz
chromium_src-33fca12d265b8129e6cff8fc1fc9ad7b34a19bab.tar.bz2
Revert 239921 "Revert 239759 "The comment in base64.h implies th..."
***************** Reverting the revert. Congrats, the original CL wasn't the cause for the failure; sorry for the mess. ***************** > 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 TBR=vadimt@chromium.org Review URL: https://codereview.chromium.org/111883004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239944 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/internal_api/public')
-rw-r--r--sync/internal_api/public/base/unique_position_unittest.cc2
1 files changed, 1 insertions, 1 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;
}