Revert 239759 "The comment in base64.h implies that base::Base64..."

trunk/src/net/http/http_auth_sspi_win.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // See "SSPI Sample Application" at
 // http://msdn.microsoft.com/en-us/library/aa918273.aspx
 
 #include "net/http/http_auth_sspi_win.h"
 
 #include "base/base64.h"
@@ skipping 262 matching lines @@
           decoded_server_auth_token_.c_str())),
       decoded_server_auth_token_.length(),
       &out_buf,
       &out_buf_len);
   if (rv != OK)
     return rv;
 
   // Base64 encode data in output buffer and prepend the scheme.
   std::string encode_input(static_cast<char*>(out_buf), out_buf_len);
   std::string encode_output;
-  base::Base64Encode(encode_input, &encode_output);
+  bool base64_rv = base::Base64Encode(encode_input, &encode_output);
   // OK, we are done with |out_buf|
   free(out_buf);
+  if (!base64_rv) {
+    LOG(ERROR) << "Base64 encoding of auth token failed.";
+    return ERR_ENCODING_CONVERSION_FAILED;
+  }
   *auth_token = scheme_ + " " + encode_output;
   return OK;
 }
 
 int HttpAuthSSPI::OnFirstRound(const AuthCredentials* credentials) {
   DCHECK(!SecIsValidHandle(&cred_));
   int rv = OK;
   if (credentials) {
     base::string16 domain;
     base::string16 user;
@@ skipping 121 matching lines @@
   int token_length = pkg_info->cbMaxToken;
   status = library->FreeContextBuffer(pkg_info);
   rv = MapFreeContextBufferStatusToError(status);
   if (rv != OK)
     return rv;
   *max_token_length = token_length;
   return OK;
 }
 
 }  // namespace net