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 [email protected]
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72106 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome_frame/vtable_patch_manager.cc b/chrome_frame/vtable_patch_manager.cc
index 9f60d3a..21c4f2f 100644
--- a/chrome_frame/vtable_patch_manager.cc
+++ b/chrome_frame/vtable_patch_manager.cc
@@ -9,10 +9,9 @@
#include <algorithm>
#include "base/atomicops.h"
-#include "base/lock.h"
#include "base/logging.h"
#include "base/scoped_ptr.h"
-
+#include "base/synchronization/lock.h"
#include "chrome_frame/function_stub.h"
#include "chrome_frame/utils.h"
@@ -25,7 +24,7 @@
// We hold a lock over all patching operations to make sure that we don't
// e.g. race on VM operations to the same patches, or to physical pages
// shared across different VTABLEs.
-Lock patch_lock_;
+base::Lock patch_lock_;
namespace internal {
// Because other parties in our process might be attempting to patch the same
@@ -75,7 +74,7 @@
// is done under a global lock, to ensure multiple threads don't
// race, whether on an individual patch, or on VM operations to
// the same physical pages.
- AutoLock lock(patch_lock_);
+ base::AutoLock lock(patch_lock_);
for (MethodPatchInfo* it = patches; it->index_ != -1; ++it) {
if (it->stub_ != NULL) {
@@ -153,7 +152,7 @@
}
HRESULT UnpatchInterfaceMethods(MethodPatchInfo* patches) {
- AutoLock lock(patch_lock_);
+ base::AutoLock lock(patch_lock_);
for (MethodPatchInfo* it = patches; it->index_ != -1; ++it) {
if (it->stub_) {
