From b90d7e80c20c7c20831bedfe3fa6028ddab1ae95 Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Sun, 9 Jan 2011 16:32:20 +0000 Subject: 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 --- chrome_frame/vtable_patch_manager_unittest.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'chrome_frame/vtable_patch_manager_unittest.cc') diff --git a/chrome_frame/vtable_patch_manager_unittest.cc b/chrome_frame/vtable_patch_manager_unittest.cc index 4e04796..842a32a 100644 --- a/chrome_frame/vtable_patch_manager_unittest.cc +++ b/chrome_frame/vtable_patch_manager_unittest.cc @@ -1,12 +1,14 @@ -// 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. #include "chrome_frame/vtable_patch_manager.h" + #include + #include "base/message_loop.h" #include "base/threading/thread.h" -#include "base/scoped_handle.h" +#include "base/win/scoped_handle.h" #include "gtest/gtest.h" #include "gmock/gmock.h" @@ -209,7 +211,7 @@ TEST_F(VtablePatchManagerTest, ThreadSafePatching) { base::Thread background("Background Test Thread"); EXPECT_TRUE(background.Start()); - ScopedHandle event(::CreateEvent(NULL, TRUE, FALSE, NULL)); + base::win::ScopedHandle event(::CreateEvent(NULL, TRUE, FALSE, NULL)); // Grab the patch lock. vtable_patch::patch_lock_.Acquire(); -- cgit v1.1