Reland "Remove base/scoped_handle_win.h."

chrome_frame/test/test_with_web_server.h

Index: chrome_frame/test/test_with_web_server.h
diff --git a/chrome_frame/test/test_with_web_server.h b/chrome_frame/test/test_with_web_server.h
index 3b424f372252174b1ed0829935539a62a0f7b0f0..eaecbeff40e88c0771335926750e2d4292820704 100644
--- a/chrome_frame/test/test_with_web_server.h
+++ b/chrome_frame/test/test_with_web_server.h
@@ -1,9 +1,10 @@
-// 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.
 
 #ifndef CHROME_FRAME_TEST_TEST_WITH_WEB_SERVER_H_
 #define CHROME_FRAME_TEST_TEST_WITH_WEB_SERVER_H_
+#pragma once
 
 #include <windows.h>
 #include <string>
@@ -11,6 +12,7 @@
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
+#include "base/win/scoped_handle.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
 #include "chrome_frame/test/http_server.h"
 #include "chrome_frame/test/test_server.h"
@@ -216,7 +218,7 @@ class ChromeFrameTestWithWebServer: public testing::Test {
 
   BrowserKind browser_;
   FilePath results_dir_;
-  ScopedHandle browser_handle_;
+  base::win::ScopedHandle browser_handle_;
   // The on-disk path to our html test files.
   FilePath test_file_path_;