Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file.

webkit/glue/webkitclient_impl.cc

 // Copyright (c) 2010 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 "webkit/glue/webkitclient_impl.h"
 
 #if defined(OS_LINUX)
 #include <malloc.h>
 #endif
 
 #include <math.h>
 
 #include <vector>
 
 #include "base/debug/trace_event.h"
-#include "base/lock.h"
 #include "base/message_loop.h"
 #include "base/metrics/stats_counters.h"
 #include "base/metrics/histogram.h"
 #include "base/process_util.h"
 #include "base/platform_file.h"
 #include "base/singleton.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
+#include "base/synchronization/lock.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "grit/webkit_resources.h"
 #include "grit/webkit_strings.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCookie.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebData.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrameClient.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPluginListBuilder.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
@@ skipping 36 matching lines @@
   ~MemoryUsageCache() {}
 
   void Init() {
     const unsigned int kCacheSeconds = 1;
     cache_valid_time_ = base::TimeDelta::FromSeconds(kCacheSeconds);
   }
 
   // Returns true if the cached value is fresh.
   // Returns false if the cached value is stale, or if |cached_value| is NULL.
   bool IsCachedValueValid(size_t* cached_value) {
-    AutoLock scoped_lock(lock_);
+    base::AutoLock scoped_lock(lock_);
     if (!cached_value)
       return false;
     if (base::Time::Now() - last_updated_time_ > cache_valid_time_)
       return false;
     *cached_value = memory_value_;
     return true;
   };
 
   // Setter for |memory_value_|, refreshes |last_updated_time_|.
   void SetMemoryValue(const size_t value) {
-    AutoLock scoped_lock(lock_);
+    base::AutoLock scoped_lock(lock_);
     memory_value_ = value;
     last_updated_time_ = base::Time::Now();
   }
 
  private:
   // The cached memory value.
   size_t memory_value_;
 
   // How long the cached value should remain valid.
   base::TimeDelta cache_valid_time_;
 
   // The last time the cached value was updated.
   base::Time last_updated_time_;
 
-  Lock lock_;
+  base::Lock lock_;
 };
 
 }  // anonymous namespace
 
 namespace webkit_glue {
 
 static int ToMessageID(WebLocalizedString::Name name) {
   switch (name) {
     case WebLocalizedString::SubmitButtonDefaultLabel:
       return IDS_FORM_SUBMIT_LABEL;
@@ skipping 421 matching lines @@
   ++shared_timer_suspended_;
 }
 
 void WebKitClientImpl::ResumeSharedTimer() {
   // The shared timer may have fired or been adjusted while we were suspended.
   if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning())
     setSharedTimerFireTime(shared_timer_fire_time_);
 }
 
 }  // namespace webkit_glue