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

Side by Side Diff: net/test/spawned_test_server/local_test_server.h

Issue 197873014: Revert of Implement ScopedFD in terms of ScopedGeneric. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_SPAWNED_TEST_SERVER_LOCAL_TEST_SERVER_H_ 5 #ifndef NET_TEST_SPAWNED_TEST_SERVER_LOCAL_TEST_SERVER_H_
6 #define NET_TEST_SPAWNED_TEST_SERVER_LOCAL_TEST_SERVER_H_ 6 #define NET_TEST_SPAWNED_TEST_SERVER_LOCAL_TEST_SERVER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/file_util.h" 10 #include "base/file_util.h"
11 #include "base/files/scoped_file.h"
12 #include "base/process/process_handle.h" 11 #include "base/process/process_handle.h"
13 #include "net/test/spawned_test_server/base_test_server.h" 12 #include "net/test/spawned_test_server/base_test_server.h"
14 13
15 #if defined(OS_WIN) 14 #if defined(OS_WIN)
16 #include "base/win/scoped_handle.h" 15 #include "base/win/scoped_handle.h"
17 #endif 16 #endif
18 17
19 class CommandLine; 18 class CommandLine;
20 19
21 namespace net { 20 namespace net {
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 98
100 // The pipe file handle we read from. 99 // The pipe file handle we read from.
101 base::win::ScopedHandle child_read_fd_; 100 base::win::ScopedHandle child_read_fd_;
102 101
103 // The pipe file handle the child and we write to. 102 // The pipe file handle the child and we write to.
104 base::win::ScopedHandle child_write_fd_; 103 base::win::ScopedHandle child_write_fd_;
105 #endif 104 #endif
106 105
107 #if defined(OS_POSIX) 106 #if defined(OS_POSIX)
108 // The file descriptor the child writes to when it starts. 107 // The file descriptor the child writes to when it starts.
109 base::ScopedFD child_fd_; 108 int child_fd_;
109 file_util::ScopedFD child_fd_closer_;
110 #endif 110 #endif
111 111
112 DISALLOW_COPY_AND_ASSIGN(LocalTestServer); 112 DISALLOW_COPY_AND_ASSIGN(LocalTestServer);
113 }; 113 };
114 114
115 } // namespace net 115 } // namespace net
116 116
117 #endif // NET_TEST_SPAWNED_TEST_SERVER_LOCAL_TEST_SERVER_H_ 117 #endif // NET_TEST_SPAWNED_TEST_SERVER_LOCAL_TEST_SERVER_H_
OLDNEW
« no previous file with comments | « media/video/capture/linux/video_capture_device_linux.cc ('k') | net/test/spawned_test_server/local_test_server_posix.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698