diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-09 16:32:20 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-09 16:32:20 +0000 |
| commit | b90d7e80c20c7c20831bedfe3fa6028ddab1ae95 (patch) | |
| tree | 308e927055c27a533019d329a9677ce8e7c53e33 /chrome_frame/test/urlmon_moniker_integration_test.cc | |
| parent | d716d4178136a223e9e79b3508c755a71108a068 (diff) | |
| download | chromium_src-b90d7e80c20c7c20831bedfe3fa6028ddab1ae95.zip chromium_src-b90d7e80c20c7c20831bedfe3fa6028ddab1ae95.tar.gz chromium_src-b90d7e80c20c7c20831bedfe3fa6028ddab1ae95.tar.bz2 | |
Reland "Remove base/scoped_handle_win.h."
Fixed the problem with rlz library. Now should be fine to land this again.
This reverts commit 3620d9501af7bff688862c54fdd60f7eb41797f3.
Original Review URL: http://codereview.chromium.org/6126002/
BUG=None
TEST=trybots
Review URL: http://codereview.chromium.org/6110005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70861 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/urlmon_moniker_integration_test.cc')
| -rw-r--r-- | chrome_frame/test/urlmon_moniker_integration_test.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome_frame/test/urlmon_moniker_integration_test.cc b/chrome_frame/test/urlmon_moniker_integration_test.cc index 4e9c29b9..b27b90d 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. |