| Index: net/test/test_server.h
|
| diff --git a/net/test/test_server.h b/net/test/test_server.h
|
| index 9686aef55aaae29351a47c91e7f0e5182f0d4cf0..6d93fc8709fb6a9b5ad510c306687ee510af541d 100644
|
| --- a/net/test/test_server.h
|
| +++ b/net/test/test_server.h
|
| @@ -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.
|
|
|
| @@ -20,7 +20,7 @@
|
| #include "net/base/net_util.h"
|
|
|
| #if defined(OS_WIN)
|
| -#include "base/scoped_handle_win.h"
|
| +#include "base/win/scoped_handle.h"
|
| #endif
|
|
|
| class CommandLine;
|
| @@ -177,13 +177,13 @@ class TestServer {
|
|
|
| #if defined(OS_WIN)
|
| // JobObject used to clean up orphaned child processes.
|
| - ScopedHandle job_handle_;
|
| + base::win::ScopedHandle job_handle_;
|
|
|
| // The pipe file handle we read from.
|
| - ScopedHandle child_read_fd_;
|
| + base::win::ScopedHandle child_read_fd_;
|
|
|
| // The pipe file handle the child and we write to.
|
| - ScopedHandle child_write_fd_;
|
| + base::win::ScopedHandle child_write_fd_;
|
| #endif
|
|
|
| #if defined(OS_POSIX)
|
|
|