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

trunk/src/google_apis/cup/client_update_protocol.cc

 // Copyright 2013 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.
 
 #include "google_apis/cup/client_update_protocol.h"
 
 #include "base/base64.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/sha1.h"
@@ skipping 104 matching lines @@
   result.insert(result.end(), digest.begin(), digest.end());
   DCHECK_EQ(result.size(), rsa_key_size);
   return result;
 }
 
 // CUP passes the versioned secret in the query portion of the URL for the
 // update check service -- and that means that a URL-safe variant of Base64 is
 // needed.  Call the standard Base64 encoder/decoder and then apply fixups.
 std::string UrlSafeB64Encode(const std::vector<uint8>& data) {
   std::string result;
-  if (!base::Base64Encode(ByteVectorToSP(data), &result))
-    return std::string();
+  base::Base64Encode(ByteVectorToSP(data), &result);
 
   // Do an tr|+/|-_| on the output, and strip any '=' padding.
   for (std::string::iterator it = result.begin(); it != result.end(); ++it) {
     switch (*it) {
       case '+':
         *it = '-';
         break;
       case '/':
         *it = '_';
         break;
@@ skipping 158 matching lines @@
 
   // Encrypt the key source (r) using the public key (pk[v]) to generate the
   // encrypted key source (w).
   if (!EncryptKeySource(source))
     return false;
   if (encrypted_key_source_.size() != PublicKeyLength())
     return false;
 
   return true;
 }
-