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

chrome/renderer/renderer_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 "chrome/renderer/renderer_webkitclient_impl.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/platform_file.h"
 #include "base/shared_memory.h"
@@ skipping 40 matching lines @@
 #if defined(OS_MACOSX)
 #include "chrome/common/font_descriptor_mac.h"
 #include "chrome/common/font_loader_mac.h"
 #include "third_party/WebKit/WebKit/chromium/public/mac/WebSandboxSupport.h"
 #endif
 
 #if defined(OS_LINUX)
 #include <string>
 #include <map>
 
-#include "base/lock.h"
+#include "base/synchronization/lock.h"
 #include "chrome/renderer/renderer_sandbox_support_linux.h"
 #include "third_party/WebKit/WebKit/chromium/public/linux/WebSandboxSupport.h"
 #endif
 
 #if defined(OS_POSIX)
 #include "base/file_descriptor_posix.h"
 #endif
 
 using WebKit::WebBlobRegistry;
 using WebKit::WebFileSystem;
@@ skipping 43 matching lines @@
   virtual WebKit::WebString getFontFamilyForCharacters(
       const WebKit::WebUChar* characters, size_t numCharacters);
   virtual void getRenderStyleForStrike(
       const char* family, int sizeAndStyle, WebKit::WebFontRenderStyle* out);
 
  private:
   // WebKit likes to ask us for the correct font family to use for a set of
   // unicode code points. It needs this information frequently so we cache it
   // here. The key in this map is an array of 16-bit UTF16 values from WebKit.
   // The value is a string containing the correct font family.
-  Lock unicode_font_families_mutex_;
+  base::Lock unicode_font_families_mutex_;
   std::map<std::string, std::string> unicode_font_families_;
 #endif
 };
 
 //------------------------------------------------------------------------------
 
 RendererWebKitClientImpl::RendererWebKitClientImpl()
     : clipboard_(new webkit_glue::WebClipboardImpl),
       mime_registry_(new RendererWebKitClientImpl::MimeRegistry),
       sandbox_support_(new RendererWebKitClientImpl::SandboxSupport),
@@ skipping 278 matching lines @@
 bool RendererWebKitClientImpl::SandboxSupport::ensureFontLoaded(HFONT font) {
   LOGFONT logfont;
   GetObject(font, sizeof(LOGFONT), &logfont);
   return RenderThread::current()->Send(new ViewHostMsg_PreCacheFont(logfont));
 }
 
 #elif defined(OS_LINUX)
 
 WebString RendererWebKitClientImpl::SandboxSupport::getFontFamilyForCharacters(
     const WebKit::WebUChar* characters, size_t num_characters) {
-  AutoLock lock(unicode_font_families_mutex_);
+  base::AutoLock lock(unicode_font_families_mutex_);
   const std::string key(reinterpret_cast<const char*>(characters),
                         num_characters * sizeof(characters[0]));
   const std::map<std::string, std::string>::const_iterator iter =
       unicode_font_families_.find(key);
   if (iter != unicode_font_families_.end())
     return WebString::fromUTF8(iter->second);
 
   const std::string family_name =
       renderer_sandbox_support::getFontFamilyForCharacters(characters,
                                                            num_characters);
@@ skipping 99 matching lines @@
   return WebString::fromUTF8(signed_public_key);
 }
 
 //------------------------------------------------------------------------------
 
 WebBlobRegistry* RendererWebKitClientImpl::blobRegistry() {
   if (!blob_registry_.get())
     blob_registry_.reset(new WebBlobRegistryImpl(RenderThread::current()));
   return blob_registry_.get();
 }