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

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

Issue 6126002: Remove base/scoped_handle_win.h stub and fix up all callers to use the new location and namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 9 years, 11 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include "net/base/net_util.h" 20 #include "net/base/net_util.h"
21 21
22 #if defined(OS_WIN) 22 #if defined(OS_WIN)
23 #include "base/scoped_handle_win.h" 23 #include "base/win/scoped_handle.h"
24 #endif 24 #endif
25 25
26 class CommandLine; 26 class CommandLine;
27 class DictionaryValue; 27 class DictionaryValue;
28 class GURL; 28 class GURL;
29 29
30 namespace net { 30 namespace net {
31 31
32 class AddressList; 32 class AddressList;
33 33
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 // Holds the data sent from the server (e.g., port number). 170 // Holds the data sent from the server (e.g., port number).
171 scoped_ptr<DictionaryValue> server_data_; 171 scoped_ptr<DictionaryValue> server_data_;
172 172
173 // Handle of the Python process running the test server. 173 // Handle of the Python process running the test server.
174 base::ProcessHandle process_handle_; 174 base::ProcessHandle process_handle_;
175 175
176 scoped_ptr<net::ScopedPortException> allowed_port_; 176 scoped_ptr<net::ScopedPortException> allowed_port_;
177 177
178 #if defined(OS_WIN) 178 #if defined(OS_WIN)
179 // JobObject used to clean up orphaned child processes. 179 // JobObject used to clean up orphaned child processes.
180 ScopedHandle job_handle_; 180 base::win::ScopedHandle job_handle_;
181 181
182 // The pipe file handle we read from. 182 // The pipe file handle we read from.
183 ScopedHandle child_read_fd_; 183 base::win::ScopedHandle child_read_fd_;
184 184
185 // The pipe file handle the child and we write to. 185 // The pipe file handle the child and we write to.
186 ScopedHandle child_write_fd_; 186 base::win::ScopedHandle child_write_fd_;
187 #endif 187 #endif
188 188
189 #if defined(OS_POSIX) 189 #if defined(OS_POSIX)
190 // The file descriptor the child writes to when it starts. 190 // The file descriptor the child writes to when it starts.
191 int child_fd_; 191 int child_fd_;
192 file_util::ScopedFD child_fd_closer_; 192 file_util::ScopedFD child_fd_closer_;
193 #endif 193 #endif
194 194
195 // If |type_| is TYPE_HTTPS, the TLS settings to use for the test server. 195 // If |type_| is TYPE_HTTPS, the TLS settings to use for the test server.
196 HTTPSOptions https_options_; 196 HTTPSOptions https_options_;
197 197
198 Type type_; 198 Type type_;
199 199
200 // Has the server been started? 200 // Has the server been started?
201 bool started_; 201 bool started_;
202 202
203 DISALLOW_COPY_AND_ASSIGN(TestServer); 203 DISALLOW_COPY_AND_ASSIGN(TestServer);
204 }; 204 };
205 205
206 } // namespace net 206 } // namespace net
207 207
208 #endif // NET_TEST_TEST_SERVER_H_ 208 #endif // NET_TEST_TEST_SERVER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698