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

trunk/src/sync/internal_api/sync_encryption_handler_impl.cc

 // Copyright 2012 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 "sync/internal_api/sync_encryption_handler_impl.h"
 
 #include <queue>
 #include <string>
 
 #include "base/base64.h"
@@ skipping 674 matching lines @@
   if (keys.size() == 0)
     return false;
   // The last key in the vector is the current keystore key. The others are kept
   // around for decryption only.
   const std::string& raw_keystore_key = keys.Get(keys.size() - 1);
   if (raw_keystore_key.empty())
     return false;
 
   // Note: in order to Pack the keys, they must all be base64 encoded (else
   // JSON serialization fails).
-  base::Base64Encode(raw_keystore_key, &keystore_key_);
+  if (!base::Base64Encode(raw_keystore_key, &keystore_key_))
+    return false;
 
   // Go through and save the old keystore keys. We always persist all keystore
   // keys the server sends us.
   old_keystore_keys_.resize(keys.size() - 1);
   for (int i = 0; i < keys.size() - 1; ++i)
     base::Base64Encode(keys.Get(i), &old_keystore_keys_[i]);
 
   Cryptographer* cryptographer = &UnlockVaultMutable(trans)->cryptographer;
 
   // Update the bootstrap token. If this fails, we persist an empty string,
@@ skipping 936 matching lines @@
 
 base::Time SyncEncryptionHandlerImpl::GetExplicitPassphraseTime() const {
   if (passphrase_type_ == FROZEN_IMPLICIT_PASSPHRASE)
     return migration_time();
   else if (passphrase_type_ == CUSTOM_PASSPHRASE)
     return custom_passphrase_time();
   return base::Time();
 }
 
 }  // namespace browser_sync