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

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, 8 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
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 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 return *server_data_; 136 return *server_data_;
137 } 137 }
138 138
139 std::string BaseTestServer::GetScheme() const { 139 std::string BaseTestServer::GetScheme() const {
140 switch (type_) { 140 switch (type_) {
141 case TYPE_FTP: 141 case TYPE_FTP:
142 return "ftp"; 142 return "ftp";
143 case TYPE_GDATA: 143 case TYPE_GDATA:
144 case TYPE_HTTP: 144 case TYPE_HTTP:
145 case TYPE_SYNC: 145 case TYPE_SYNC:
146 case TYPE_SAFEBROWSING:
Paweł Hajdan Jr. 2012/04/17 06:38:05 nit: Sort.
mattm 2012/04/18 00:20:00 Done.
146 return "http"; 147 return "http";
147 case TYPE_HTTPS: 148 case TYPE_HTTPS:
148 return "https"; 149 return "https";
149 case TYPE_TCP_ECHO: 150 case TYPE_TCP_ECHO:
150 case TYPE_UDP_ECHO: 151 case TYPE_UDP_ECHO:
151 default: 152 default:
152 NOTREACHED(); 153 NOTREACHED();
153 } 154 }
154 return std::string(); 155 return std::string();
155 } 156 }
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 GetCiphersList(https_options_.bulk_ciphers, bulk_cipher_values.get()); 374 GetCiphersList(https_options_.bulk_ciphers, bulk_cipher_values.get());
374 if (bulk_cipher_values->GetSize()) 375 if (bulk_cipher_values->GetSize())
375 arguments->Set("ssl-bulk-cipher", bulk_cipher_values.release()); 376 arguments->Set("ssl-bulk-cipher", bulk_cipher_values.release());
376 if (https_options_.record_resume) 377 if (https_options_.record_resume)
377 arguments->Set("https-record-resume", base::Value::CreateNullValue()); 378 arguments->Set("https-record-resume", base::Value::CreateNullValue());
378 } 379 }
379 return true; 380 return true;
380 } 381 }
381 382
382 } // namespace net 383 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698