| Index: net/test/test_server_win.cc
|
| diff --git a/net/test/test_server_win.cc b/net/test/test_server_win.cc
|
| index 075b48472f405e140637d5f031e6afbc01085492..9fc13cd3efcd193857ec3ceac21b5f09cf545737 100644
|
| --- a/net/test/test_server_win.cc
|
| +++ b/net/test/test_server_win.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2010 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -17,6 +17,7 @@
|
| #include "base/test/test_timeouts.h"
|
| #include "base/threading/thread.h"
|
| #include "base/utf_string_conversions.h"
|
| +#include "base/win/scoped_handle.h"
|
|
|
| #pragma comment(lib, "crypt32.lib")
|
|
|
| @@ -25,7 +26,7 @@ namespace {
|
| bool LaunchTestServerAsJob(const CommandLine& cmdline,
|
| bool start_hidden,
|
| base::ProcessHandle* process_handle,
|
| - ScopedHandle* job_handle) {
|
| + base::win::ScopedHandle* job_handle) {
|
| // Launch test server process.
|
| STARTUPINFO startup_info = {0};
|
| startup_info.cb = sizeof(startup_info);
|
| @@ -191,8 +192,8 @@ bool TestServer::LaunchPython(const FilePath& testserver_path) {
|
| }
|
|
|
| bool TestServer::WaitToStart() {
|
| - ScopedHandle read_fd(child_read_fd_.Take());
|
| - ScopedHandle write_fd(child_write_fd_.Take());
|
| + base::win::ScopedHandle read_fd(child_read_fd_.Take());
|
| + base::win::ScopedHandle write_fd(child_write_fd_.Take());
|
|
|
| uint32 server_data_len = 0;
|
| if (!ReadData(read_fd.Get(), write_fd.Get(), sizeof(server_data_len),
|
|
|