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

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

Issue 12210088: Make the TestServer use an absolute document root path. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: testserver uses absolute docroot path Created 7 years, 10 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 #ifndef NET_TEST_REMOTE_TEST_SERVER_H_ 5 #ifndef NET_TEST_REMOTE_TEST_SERVER_H_
6 #define NET_TEST_REMOTE_TEST_SERVER_H_ 6 #define NET_TEST_REMOTE_TEST_SERVER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "net/test/base_test_server.h" 10 #include "net/test/base_test_server.h"
11 11
12 namespace net { 12 namespace net {
13 13
14 class SpawnerCommunicator; 14 class SpawnerCommunicator;
15 15
16 // The RemoteTestServer runs an external Python-based test server in another 16 // The RemoteTestServer runs an external Python-based test server in another
17 // machine that is different from the machine in which RemoteTestServer runs. 17 // machine that is different from the machine in which RemoteTestServer runs.
18 class RemoteTestServer : public BaseTestServer { 18 class RemoteTestServer : public BaseTestServer {
19 public: 19 public:
20 // Initialize a TestServer listening on a specific host (IP or hostname). 20 // Initialize a TestServer listening on a specific host (IP or hostname).
21 // |document_root| must be a relative path under the root tree. 21 // |document_root| must be an absolute path.
Paweł Hajdan Jr. 2013/02/11 15:36:53 I just realized this may be a problem for the use
22 RemoteTestServer(Type type, 22 RemoteTestServer(Type type,
23 const std::string& host, 23 const std::string& host,
24 const base::FilePath& document_root); 24 const base::FilePath& document_root);
25 25
26 // Initialize a TestServer with a specific set of SSLOptions. 26 // Initialize a TestServer with a specific set of SSLOptions.
27 // |document_root| must be a relative path under the root tree. 27 // |document_root| must be an absolute path.
28 RemoteTestServer(Type type, 28 RemoteTestServer(Type type,
29 const SSLOptions& ssl_options, 29 const SSLOptions& ssl_options,
30 const base::FilePath& document_root); 30 const base::FilePath& document_root);
31 31
32 virtual ~RemoteTestServer(); 32 virtual ~RemoteTestServer();
33 33
34 // Starts the Python test server on the host, instead of on the device, and 34 // Starts the Python test server on the host, instead of on the device, and
35 // blocks until the server is ready. 35 // blocks until the server is ready.
36 bool Start() WARN_UNUSED_RESULT; 36 bool Start() WARN_UNUSED_RESULT;
37 37
(...skipping 24 matching lines...) Expand all
62 // the host machine. 62 // the host machine.
63 scoped_ptr<SpawnerCommunicator> spawner_communicator_; 63 scoped_ptr<SpawnerCommunicator> spawner_communicator_;
64 64
65 DISALLOW_COPY_AND_ASSIGN(RemoteTestServer); 65 DISALLOW_COPY_AND_ASSIGN(RemoteTestServer);
66 }; 66 };
67 67
68 } // namespace net 68 } // namespace net
69 69
70 #endif // NET_TEST_REMOTE_TEST_SERVER_H_ 70 #endif // NET_TEST_REMOTE_TEST_SERVER_H_
71 71
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698