diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 04:55:52 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 04:55:52 +0000 |
| commit | 20305ec6f1acf21392c2f3938a14a96f1e28e76d (patch) | |
| tree | 6eff1f7be4bad1a1362d3466f0ac59292dc51acc /chrome_frame/function_stub.cc | |
| parent | c6e8346b56ab61b35845aefcf9b241c654fe1253 (diff) | |
| download | chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.zip chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.tar.gz chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.tar.bz2 | |
Remove obsolete base/lock.h and fix up callers to use the new header file and
the base namespace. Fix several files including lock.h unnecessarily.
BUG=none
TEST=none
Original review=http://codereview.chromium.org/6142009/
Patch by leviw@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72106 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/function_stub.cc')
| -rw-r--r-- | chrome_frame/function_stub.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome_frame/function_stub.cc b/chrome_frame/function_stub.cc index 59a4029..2b04148 100644 --- a/chrome_frame/function_stub.cc +++ b/chrome_frame/function_stub.cc @@ -1,10 +1,12 @@ // Copyright (c) 2009 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/function_stub.h" #include <new> -#include "base/lock.h" + +#include "base/synchronization/lock.h" #include "base/logging.h" #ifndef _M_IX86 @@ -48,14 +50,14 @@ class ExecutableHeap { } void CreateHeap() { - AutoLock lock(init_lock_); + base::AutoLock lock(init_lock_); if (heap_ == NULL) heap_ = ::HeapCreate(HEAP_CREATE_ENABLE_EXECUTE, 0, 0); } private: - Lock init_lock_; + base::Lock init_lock_; HANDLE heap_; }; |