Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(35)

Side by Side Diff: trunk/src/net/test/spawned_test_server/base_test_server.cc

Issue 101113004: Revert 239759 "The comment in base64.h implies that base::Base64..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/test/spawned_test_server/base_test_server.h" 5 #include "net/test/spawned_test_server/base_test_server.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/base64.h" 10 #include "base/base64.h"
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 std::string new_file_path = original_file_path; 219 std::string new_file_path = original_file_path;
220 bool first_query_parameter = true; 220 bool first_query_parameter = true;
221 const std::vector<StringPair>::const_iterator end = text_to_replace.end(); 221 const std::vector<StringPair>::const_iterator end = text_to_replace.end();
222 for (std::vector<StringPair>::const_iterator it = text_to_replace.begin(); 222 for (std::vector<StringPair>::const_iterator it = text_to_replace.begin();
223 it != end; 223 it != end;
224 ++it) { 224 ++it) {
225 const std::string& old_text = it->first; 225 const std::string& old_text = it->first;
226 const std::string& new_text = it->second; 226 const std::string& new_text = it->second;
227 std::string base64_old; 227 std::string base64_old;
228 std::string base64_new; 228 std::string base64_new;
229 base::Base64Encode(old_text, &base64_old); 229 if (!base::Base64Encode(old_text, &base64_old))
230 base::Base64Encode(new_text, &base64_new); 230 return false;
231 if (!base::Base64Encode(new_text, &base64_new))
232 return false;
231 if (first_query_parameter) { 233 if (first_query_parameter) {
232 new_file_path += "?"; 234 new_file_path += "?";
233 first_query_parameter = false; 235 first_query_parameter = false;
234 } else { 236 } else {
235 new_file_path += "&"; 237 new_file_path += "&";
236 } 238 }
237 new_file_path += "replace_text="; 239 new_file_path += "replace_text=";
238 new_file_path += base64_old; 240 new_file_path += base64_old;
239 new_file_path += ":"; 241 new_file_path += ":";
240 new_file_path += base64_new; 242 new_file_path += base64_new;
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 if (bulk_cipher_values->GetSize()) 393 if (bulk_cipher_values->GetSize())
392 arguments->Set("ssl-bulk-cipher", bulk_cipher_values.release()); 394 arguments->Set("ssl-bulk-cipher", bulk_cipher_values.release());
393 if (ssl_options_.record_resume) 395 if (ssl_options_.record_resume)
394 arguments->Set("https-record-resume", base::Value::CreateNullValue()); 396 arguments->Set("https-record-resume", base::Value::CreateNullValue());
395 if (ssl_options_.tls_intolerant != SSLOptions::TLS_INTOLERANT_NONE) { 397 if (ssl_options_.tls_intolerant != SSLOptions::TLS_INTOLERANT_NONE) {
396 arguments->Set("tls-intolerant", 398 arguments->Set("tls-intolerant",
397 new base::FundamentalValue(ssl_options_.tls_intolerant)); 399 new base::FundamentalValue(ssl_options_.tls_intolerant));
398 } 400 }
399 if (!ssl_options_.signed_cert_timestamps.empty()) { 401 if (!ssl_options_.signed_cert_timestamps.empty()) {
400 std::string b64_scts; 402 std::string b64_scts;
401 base::Base64Encode(ssl_options_.signed_cert_timestamps, &b64_scts); 403 if (!base::Base64Encode(ssl_options_.signed_cert_timestamps, &b64_scts))
404 return false;
402 arguments->SetString("signed-cert-timestamps", b64_scts); 405 arguments->SetString("signed-cert-timestamps", b64_scts);
403 } 406 }
404 } 407 }
405 408
406 return GenerateAdditionalArguments(arguments); 409 return GenerateAdditionalArguments(arguments);
407 } 410 }
408 411
409 bool BaseTestServer::GenerateAdditionalArguments( 412 bool BaseTestServer::GenerateAdditionalArguments(
410 base::DictionaryValue* arguments) const { 413 base::DictionaryValue* arguments) const {
411 return true; 414 return true;
412 } 415 }
413 416
414 } // namespace net 417 } // namespace net
OLDNEW
« no previous file with comments | « trunk/src/net/http/http_auth_sspi_win.cc ('k') | trunk/src/net/third_party/mozilla_security_manager/nsKeygenHandler.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698