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 /sandbox/src/registry_dispatcher.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 'sandbox/src/registry_dispatcher.cc')
-rw-r--r-- | sandbox/src/registry_dispatcher.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sandbox/src/registry_dispatcher.cc b/sandbox/src/registry_dispatcher.cc index 5f53770..f86c76a 100644 --- a/sandbox/src/registry_dispatcher.cc +++ b/sandbox/src/registry_dispatcher.cc @@ -1,10 +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. #include "sandbox/src/registry_dispatcher.h" -#include "base/scoped_handle_win.h" +#include "base/win/scoped_handle.h" #include "base/win/windows_version.h" #include "sandbox/src/crosscall_client.h" #include "sandbox/src/interception.h" @@ -74,7 +74,7 @@ bool RegistryDispatcher::SetupService(InterceptionManager* manager, bool RegistryDispatcher::NtCreateKey( IPCInfo* ipc, std::wstring* name, DWORD attributes, HANDLE root, DWORD desired_access, DWORD title_index, DWORD create_options) { - ScopedHandle root_handle; + base::win::ScopedHandle root_handle; std::wstring real_path = *name; // If there is a root directory, we need to duplicate the handle to make @@ -120,7 +120,7 @@ bool RegistryDispatcher::NtCreateKey( bool RegistryDispatcher::NtOpenKey(IPCInfo* ipc, std::wstring* name, DWORD attributes, HANDLE root, DWORD desired_access) { - ScopedHandle root_handle; + base::win::ScopedHandle root_handle; std::wstring real_path = *name; // If there is a root directory, we need to duplicate the handle to make |