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

trunk/src/sync/util/cryptographer.cc

 // Copyright (c) 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/util/cryptographer.h"
 
 #include <algorithm>
 
 #include "base/base64.h"
 #include "base/basictypes.h"
@@ skipping 243 matching lines @@
   std::string unencrypted_token = GetDefaultNigoriKey();
   if (unencrypted_token.empty())
     return false;
 
   std::string encrypted_token;
   if (!encryptor_->EncryptString(unencrypted_token, &encrypted_token)) {
     NOTREACHED();
     return false;
   }
 
-  if (!base::Base64Encode(encrypted_token, token)) {
-    NOTREACHED();
-    return false;
-  }
+  base::Base64Encode(encrypted_token, token);
+
   return true;
 }
 
 std::string Cryptographer::UnpackBootstrapToken(
     const std::string& token) const {
   if (token.empty())
     return std::string();
 
   std::string encrypted_data;
   if (!base::Base64Decode(token, &encrypted_data)) {
@@ skipping 76 matching lines @@
     NOTREACHED();
     return false;
   }
 
   if (!AddKeyImpl(nigori.Pass(), true))
     return false;
   return true;
 }
 
 }  // namespace syncer