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

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

Issue 10913268: Revert 156742 - Launch pywebsocket via net::TestServer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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/local_test_server.cc ('k') | net/tools/testserver/run_testserver.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
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/base_paths.h" 9 #include "base/base_paths.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 43
44 // Please keep it sync with dictionary SERVER_TYPES in testserver.py 44 // Please keep it sync with dictionary SERVER_TYPES in testserver.py
45 std::string GetServerTypeString(BaseTestServer::Type type) { 45 std::string GetServerTypeString(BaseTestServer::Type type) {
46 switch (type) { 46 switch (type) {
47 case BaseTestServer::TYPE_FTP: 47 case BaseTestServer::TYPE_FTP:
48 return "ftp"; 48 return "ftp";
49 case BaseTestServer::TYPE_GDATA: 49 case BaseTestServer::TYPE_GDATA:
50 case BaseTestServer::TYPE_HTTP: 50 case BaseTestServer::TYPE_HTTP:
51 case BaseTestServer::TYPE_HTTPS: 51 case BaseTestServer::TYPE_HTTPS:
52 return "http"; 52 return "http";
53 case BaseTestServer::TYPE_WS:
54 case BaseTestServer::TYPE_WSS:
55 return "ws";
56 case BaseTestServer::TYPE_SYNC: 53 case BaseTestServer::TYPE_SYNC:
57 return "sync"; 54 return "sync";
58 case BaseTestServer::TYPE_TCP_ECHO: 55 case BaseTestServer::TYPE_TCP_ECHO:
59 return "tcpecho"; 56 return "tcpecho";
60 case BaseTestServer::TYPE_UDP_ECHO: 57 case BaseTestServer::TYPE_UDP_ECHO:
61 return "udpecho"; 58 return "udpecho";
62 default: 59 default:
63 NOTREACHED(); 60 NOTREACHED();
64 } 61 }
65 return std::string(); 62 return std::string();
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 175
179 SetResourcePath(document_root, FilePath().AppendASCII("net") 176 SetResourcePath(document_root, FilePath().AppendASCII("net")
180 .AppendASCII("data") 177 .AppendASCII("data")
181 .AppendASCII("ssl") 178 .AppendASCII("ssl")
182 .AppendASCII("certificates")); 179 .AppendASCII("certificates"));
183 return true; 180 return true;
184 } 181 }
185 182
186 } // namespace net 183 } // namespace net
187 184
OLDNEW
« no previous file with comments | « net/test/local_test_server.cc ('k') | net/tools/testserver/run_testserver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698