Reland "Remove base/scoped_handle_win.h."

chrome_frame/test/urlmon_moniker_integration_test.cc

Index: chrome_frame/test/urlmon_moniker_integration_test.cc
diff --git a/chrome_frame/test/urlmon_moniker_integration_test.cc b/chrome_frame/test/urlmon_moniker_integration_test.cc
index 4e9c29b93803b120cd2a3899eea6c4ac427cc035..b27b90de13d85bc232150aaa356e79014efa726e 100644
--- a/chrome_frame/test/urlmon_moniker_integration_test.cc
+++ b/chrome_frame/test/urlmon_moniker_integration_test.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 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.
 
@@ -6,6 +6,7 @@
 #include <atlcom.h>
 
 #include "base/scoped_comptr_win.h"
+#include "base/win/scoped_handle.h"
 #include "base/threading/thread.h"
 #include "chrome_frame/bho.h"
 //#include "chrome_frame/urlmon_moniker.h"
@@ -82,7 +83,7 @@ class RunTestServer : public base::Thread {
  protected:
   scoped_ptr<test_server::SimpleWebServer> server_;
   test_server::SimpleResponse default_response_;
-  ScopedHandle ready_;
+  base::win::ScopedHandle ready_;
 };
 
 // Helper class for running tests that rely on the NavigationManager.