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

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

Issue 10879029: reland: Launch pywebsocket via net::TestServer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ws works 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
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/remote_test_server.h" 5 #include "net/test/remote_test_server.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/json/json_writer.h" 10 #include "base/json/json_writer.h"
(...skipping 22 matching lines...) Expand all
33 33
34 // Please keep it sync with dictionary SERVER_TYPES in testserver.py 34 // Please keep it sync with dictionary SERVER_TYPES in testserver.py
35 std::string GetServerTypeString(BaseTestServer::Type type) { 35 std::string GetServerTypeString(BaseTestServer::Type type) {
36 switch (type) { 36 switch (type) {
37 case BaseTestServer::TYPE_FTP: 37 case BaseTestServer::TYPE_FTP:
38 return "ftp"; 38 return "ftp";
39 case BaseTestServer::TYPE_GDATA: 39 case BaseTestServer::TYPE_GDATA:
40 case BaseTestServer::TYPE_HTTP: 40 case BaseTestServer::TYPE_HTTP:
41 case BaseTestServer::TYPE_HTTPS: 41 case BaseTestServer::TYPE_HTTPS:
42 return "http"; 42 return "http";
43 case BaseTestServer::TYPE_WS:
44 case BaseTestServer::TYPE_WSS:
45 return "ws";
43 case BaseTestServer::TYPE_SYNC: 46 case BaseTestServer::TYPE_SYNC:
44 return "sync"; 47 return "sync";
45 case BaseTestServer::TYPE_TCP_ECHO: 48 case BaseTestServer::TYPE_TCP_ECHO:
46 return "tcpecho"; 49 return "tcpecho";
47 case BaseTestServer::TYPE_UDP_ECHO: 50 case BaseTestServer::TYPE_UDP_ECHO:
48 return "udpecho"; 51 return "udpecho";
49 default: 52 default:
50 NOTREACHED(); 53 NOTREACHED();
51 } 54 }
52 return std::string(); 55 return std::string();
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 168
166 SetResourcePath(document_root, FilePath().AppendASCII("net") 169 SetResourcePath(document_root, FilePath().AppendASCII("net")
167 .AppendASCII("data") 170 .AppendASCII("data")
168 .AppendASCII("ssl") 171 .AppendASCII("ssl")
169 .AppendASCII("certificates")); 172 .AppendASCII("certificates"));
170 return true; 173 return true;
171 } 174 }
172 175
173 } // namespace net 176 } // namespace net
174 177
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698