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

Side by Side Diff: net/test/base_test_server.cc

Issue 10073033: Run safebrowsing_service_test through the net testserver code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 3 months 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
« no previous file with comments | « net/test/base_test_server.h ('k') | net/test/local_sync_test_server.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/base_test_server.h" 5 #include "net/test/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 374 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 GetCiphersList(ssl_options_.bulk_ciphers, bulk_cipher_values.get()); 385 GetCiphersList(ssl_options_.bulk_ciphers, bulk_cipher_values.get());
386 if (bulk_cipher_values->GetSize()) 386 if (bulk_cipher_values->GetSize())
387 arguments->Set("ssl-bulk-cipher", bulk_cipher_values.release()); 387 arguments->Set("ssl-bulk-cipher", bulk_cipher_values.release());
388 if (ssl_options_.record_resume) 388 if (ssl_options_.record_resume)
389 arguments->Set("https-record-resume", base::Value::CreateNullValue()); 389 arguments->Set("https-record-resume", base::Value::CreateNullValue());
390 if (ssl_options_.tls_intolerant != SSLOptions::TLS_INTOLERANT_NONE) { 390 if (ssl_options_.tls_intolerant != SSLOptions::TLS_INTOLERANT_NONE) {
391 arguments->Set("tls-intolerant", 391 arguments->Set("tls-intolerant",
392 base::Value::CreateIntegerValue(ssl_options_.tls_intolerant)); 392 base::Value::CreateIntegerValue(ssl_options_.tls_intolerant));
393 } 393 }
394 } 394 }
395
396 return GenerateAdditionalArguments(arguments);
397 }
398
399 bool BaseTestServer::GenerateAdditionalArguments(
400 base::DictionaryValue* arguments) const {
395 return true; 401 return true;
396 } 402 }
397 403
398 } // namespace net 404 } // namespace net
OLDNEW
« no previous file with comments | « net/test/base_test_server.h ('k') | net/test/local_sync_test_server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698