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

trunk/src/net/test/spawned_test_server/base_test_server.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 "net/test/spawned_test_server/base_test_server.h"
 
 #include <string>
 #include <vector>
 
 #include "base/base64.h"
@@ skipping 208 matching lines @@
   std::string new_file_path = original_file_path;
   bool first_query_parameter = true;
   const std::vector<StringPair>::const_iterator end = text_to_replace.end();
   for (std::vector<StringPair>::const_iterator it = text_to_replace.begin();
        it != end;
        ++it) {
     const std::string& old_text = it->first;
     const std::string& new_text = it->second;
     std::string base64_old;
     std::string base64_new;
-    if (!base::Base64Encode(old_text, &base64_old))
-      return false;
-    if (!base::Base64Encode(new_text, &base64_new))
-      return false;
+    base::Base64Encode(old_text, &base64_old);
+    base::Base64Encode(new_text, &base64_new);
     if (first_query_parameter) {
       new_file_path += "?";
       first_query_parameter = false;
     } else {
       new_file_path += "&";
     }
     new_file_path += "replace_text=";
     new_file_path += base64_old;
     new_file_path += ":";
     new_file_path += base64_new;
@@ skipping 150 matching lines @@
     if (bulk_cipher_values->GetSize())
       arguments->Set("ssl-bulk-cipher", bulk_cipher_values.release());
     if (ssl_options_.record_resume)
       arguments->Set("https-record-resume", base::Value::CreateNullValue());
     if (ssl_options_.tls_intolerant != SSLOptions::TLS_INTOLERANT_NONE) {
       arguments->Set("tls-intolerant",
                      new base::FundamentalValue(ssl_options_.tls_intolerant));
     }
     if (!ssl_options_.signed_cert_timestamps.empty()) {
       std::string b64_scts;
-      if (!base::Base64Encode(ssl_options_.signed_cert_timestamps, &b64_scts))
-        return false;
+      base::Base64Encode(ssl_options_.signed_cert_timestamps, &b64_scts);
       arguments->SetString("signed-cert-timestamps", b64_scts);
     }
   }
 
   return GenerateAdditionalArguments(arguments);
 }
 
 bool BaseTestServer::GenerateAdditionalArguments(
     base::DictionaryValue* arguments) const {
   return true;
 }
 
 }  // namespace net