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

2 files changed, 6 insertions, 6 deletions

diff --git a/sync/util/cryptographer.cc b/sync/util/cryptographer.cc
index 0fed51e..29f3781 100644
--- a/sync/util/cryptographer.cc
+++ b/sync/util/cryptographer.cc
@@ -261,10 +261,8 @@ bool Cryptographer::GetBootstrapToken(std::string* token) const {
     return false;
   }
 
-  if (!base::Base64Encode(encrypted_token, token)) {
-    NOTREACHED();
-    return false;
-  }
+  base::Base64Encode(encrypted_token, token);
+
   return true;
 }
 
diff --git a/sync/util/nigori.cc b/sync/util/nigori.cc
index b0158f3..e74d81a91 100644
--- a/sync/util/nigori.cc
+++ b/sync/util/nigori.cc
@@ -150,7 +150,8 @@ bool Nigori::Permute(Type type, const std::string& name,
   output.assign(ciphertext);
   output.append(hash.begin(), hash.end());
 
-  return Base64Encode(output, permuted);
+  Base64Encode(output, permuted);
+  return true;
 }
 
 // Enc[Kenc,Kmac](value)
@@ -186,7 +187,8 @@ bool Nigori::Encrypt(const std::string& value, std::string* encrypted) const {
   output.append(ciphertext);
   output.append(hash.begin(), hash.end());
 
-  return Base64Encode(output, encrypted);
+  Base64Encode(output, encrypted);
+  return true;
 }
 
 bool Nigori::Decrypt(const std::string& encrypted, std::string* value) const {