summaryrefslogtreecommitdiffstats
path: root/net/test/spawned_test_server/base_test_server.cc
diff options
context:
space:
mode:
authorricea@chromium.org <ricea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-10 11:55:10 +0000
committerricea@chromium.org <ricea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-10 11:55:10 +0000
commit0553072d237ad2b977e948591de3f87eee536a9c (patch)
tree58b462d22b2342db07c041ac8abaf061e671d1e5 /net/test/spawned_test_server/base_test_server.cc
parent9377d2ad77c6d7ee0190c90544eaed0ff0c7fc9c (diff)
downloadchromium_src-0553072d237ad2b977e948591de3f87eee536a9c.zip
chromium_src-0553072d237ad2b977e948591de3f87eee536a9c.tar.gz
chromium_src-0553072d237ad2b977e948591de3f87eee536a9c.tar.bz2
The comment in base64.h implies that base::Base64Encode() can return false, but
this cannot happen in practice. Fix the comment. The implementation of Base64Encode() attempts to check for the return value MODP_B64_ERROR as a failure, but modp_b64_encode() cannot return this value. Remove the check. Remove unneeded integer cast. Change the return type to void. BUG=323357 TEST=base_unittests, compile all TBR=jochen@chromium.org,miket@chromium.org,joi@chromium.org,akalin@chromium.org,sergeyu@chromium.org Review URL: https://codereview.chromium.org/86913002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239759 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/test/spawned_test_server/base_test_server.cc')
-rw-r--r--net/test/spawned_test_server/base_test_server.cc9
1 files changed, 3 insertions, 6 deletions
diff --git a/net/test/spawned_test_server/base_test_server.cc b/net/test/spawned_test_server/base_test_server.cc
index 775341b..7ef2aba 100644
--- a/net/test/spawned_test_server/base_test_server.cc
+++ b/net/test/spawned_test_server/base_test_server.cc
@@ -226,10 +226,8 @@ bool BaseTestServer::GetFilePathWithReplacements(
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;
@@ -400,8 +398,7 @@ bool BaseTestServer::GenerateArguments(base::DictionaryValue* arguments) const {
}
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);
}
}