Revert 239921 "Revert 239759 "The comment in base64.h implies th..."

trunk/src/net/third_party/mozilla_security_manager/nsKeygenHandler.cpp

 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
@@ skipping 197 matching lines @@
   // Sign the DER encoded PublicKeyAndChallenge.
   sec_rv = SEC_DerSignData(arena, &signedItem, pkacItem.data, pkacItem.len,
                            privateKey, algTag);
   if (SECSuccess != sec_rv) {
     LOG(ERROR) << "Couldn't sign the DER encoded PublicKeyandChallenge";
     isSuccess = false;
     goto failure;
   }
 
   // Convert the signed public key and challenge into base64/ascii.
-  if (!base::Base64Encode(std::string(reinterpret_cast<char*>(signedItem.data),
-                                      signedItem.len),
-                          &result_blob)) {
-    LOG(ERROR) << "Couldn't convert signed public key into base64";
-    isSuccess = false;
-    goto failure;
-  }
+  base::Base64Encode(
+      std::string(reinterpret_cast<char*>(signedItem.data), signedItem.len),
+      &result_blob);
 
  failure:
   if (!isSuccess) {
     LOG(ERROR) << "SSL Keygen failed! (NSS error code " << PR_GetError() << ")";
   } else {
     VLOG(1) << "SSL Keygen succeeded!";
   }
 
   // Do cleanups
   if (privateKey) {
@@ skipping 17 matching lines @@
     SECKEY_DestroySubjectPublicKeyInfo(spkInfo);
   }
   if (arena) {
     PORT_FreeArena(arena, PR_TRUE);
   }
 
   return (isSuccess ? result_blob : std::string());
 }
 
 }  // namespace mozilla_security_manager