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

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

Issue 5195001: Fixes the remaining net_unittests for OpenSSL, with the exceptions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Clarify comment Created 10 years 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_TEST_SERVER_H_ 5 #ifndef NET_TEST_TEST_SERVER_H_
6 #define NET_TEST_TEST_SERVER_H_ 6 #define NET_TEST_TEST_SERVER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
11 #include <vector> 11 #include <vector>
12 12
13 #include "build/build_config.h" 13 #include "build/build_config.h"
14 14
15 #include "base/compiler_specific.h" 15 #include "base/compiler_specific.h"
16 #include "base/file_path.h" 16 #include "base/file_path.h"
17 #include "base/file_util.h" 17 #include "base/file_util.h"
18 #include "base/process_util.h" 18 #include "base/process_util.h"
19 #include "net/base/host_port_pair.h" 19 #include "net/base/host_port_pair.h"
20 20
21 #if defined(OS_WIN) 21 #if defined(OS_WIN)
22 #include "base/scoped_handle_win.h" 22 #include "base/scoped_handle_win.h"
23 #endif 23 #endif
24 24
25 #if defined(USE_NSS) 25 #if defined(USE_OPENSSL) || defined(USE_NSS)
26 #include "base/ref_counted.h" 26 #include "base/ref_counted.h"
27 #include "net/base/x509_certificate.h" 27 #include "net/base/x509_certificate.h"
28 #endif 28 #endif
29 29
30 class CommandLine; 30 class CommandLine;
31 class DictionaryValue; 31 class DictionaryValue;
32 class GURL; 32 class GURL;
33 33
34 namespace net { 34 namespace net {
35 35
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 193
194 #if defined(OS_POSIX) 194 #if defined(OS_POSIX)
195 // The file descriptor the child writes to when it starts. 195 // The file descriptor the child writes to when it starts.
196 int child_fd_; 196 int child_fd_;
197 file_util::ScopedFD child_fd_closer_; 197 file_util::ScopedFD child_fd_closer_;
198 #endif 198 #endif
199 199
200 // If |type_| is TYPE_HTTPS, the TLS settings to use for the test server. 200 // If |type_| is TYPE_HTTPS, the TLS settings to use for the test server.
201 HTTPSOptions https_options_; 201 HTTPSOptions https_options_;
202 202
203 #if defined(USE_NSS) 203 #if defined(USE_OPENSSL) || defined(USE_NSS)
204 scoped_refptr<X509Certificate> cert_; 204 scoped_refptr<X509Certificate> cert_;
205 #endif 205 #endif
206 206
207 Type type_; 207 Type type_;
208 208
209 // Has the server been started? 209 // Has the server been started?
210 bool started_; 210 bool started_;
211 211
212 DISALLOW_COPY_AND_ASSIGN(TestServer); 212 DISALLOW_COPY_AND_ASSIGN(TestServer);
213 }; 213 };
214 214
215 } // namespace net 215 } // namespace net
216 216
217 #endif // NET_TEST_TEST_SERVER_H_ 217 #endif // NET_TEST_TEST_SERVER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698