Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(567)

Unified Diff: chrome_frame/test/dll_redirector_test.cc

Issue 6126002: Remove base/scoped_handle_win.h stub and fix up all callers to use the new location and namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome_frame/test/dll_redirector_test.cc
diff --git a/chrome_frame/test/dll_redirector_test.cc b/chrome_frame/test/dll_redirector_test.cc
index f052cf4eb6a63d3e23f310e3271bb65fc3670eba..13959dc435e50b562a9c07dd79ad9227d92f4f83 100644
--- a/chrome_frame/test/dll_redirector_test.cc
+++ b/chrome_frame/test/dll_redirector_test.cc
@@ -1,14 +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/dll_redirector.h"
-#include "base/scoped_handle.h"
#include "base/shared_memory.h"
#include "base/sys_info.h"
#include "base/utf_string_conversions.h"
#include "base/version.h"
+#include "base/win/scoped_handle.h"
#include "chrome_frame/test/chrome_frame_test_utils.h"
#include "gtest/gtest.h"
@@ -27,8 +27,6 @@ const uint32 kSharedMemorySize = 128;
// before failing.
const uint32 kWaitTestTimeout = 20000;
-using base::win::ScopedHandle;
-
class MockDllRedirector : public DllRedirector {
public:
explicit MockDllRedirector(const char* beacon_name)
@@ -231,8 +229,8 @@ TEST_F(DllRedirectorTest, TestBeaconOwnershipHandoff) {
}
struct LockSquattingThreadParams {
- ScopedHandle is_squatting;
- ScopedHandle time_to_die;
+ base::win::ScopedHandle is_squatting;
+ base::win::ScopedHandle time_to_die;
};
DWORD WINAPI LockSquattingThread(void* in_params) {
@@ -268,7 +266,7 @@ TEST_F(DllRedirectorTest, LockSquatting) {
params.is_squatting.Set(::CreateEvent(NULL, FALSE, FALSE, NULL));
params.time_to_die.Set(::CreateEvent(NULL, FALSE, FALSE, NULL));
DWORD tid = 0;
- ScopedHandle lock_squat_thread(
+ base::win::ScopedHandle lock_squat_thread(
::CreateThread(NULL, 0, LockSquattingThread, &params, 0, &tid));
// Make sure the squatter has started squatting.

Powered by Google App Engine
This is Rietveld 408576698