From 20305ec6f1acf21392c2f3938a14a96f1e28e76d Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Fri, 21 Jan 2011 04:55:52 +0000 Subject: 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 --- chrome_frame/chrome_frame_automation.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'chrome_frame/chrome_frame_automation.h') diff --git a/chrome_frame/chrome_frame_automation.h b/chrome_frame/chrome_frame_automation.h index f4314ab..81d0967 100644 --- a/chrome_frame/chrome_frame_automation.h +++ b/chrome_frame/chrome_frame_automation.h @@ -11,10 +11,10 @@ #include #include -#include "base/lock.h" #include "base/ref_counted.h" #include "base/scoped_handle.h" #include "base/stack_container.h" +#include "base/synchronization/lock.h" #include "base/task.h" #include "base/threading/thread.h" #include "base/timer.h" @@ -303,7 +303,7 @@ class ProxyFactory { typedef StackVector, 4> Vector; Vector proxies_; // Lock if we are going to call GetAutomationServer from more than one thread. - Lock lock_; + base::Lock lock_; // Gathers histograms to be sent to Chrome. ChromeFrameHistogramSnapshots chrome_frame_histograms_; -- cgit v1.1