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

app/resource_bundle.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 "app/resource_bundle.h"
 
 #include "app/data_pack.h"
-#include "base/lock.h"
 #include "base/logging.h"
 #include "base/string_piece.h"
+#include "base/synchronization/lock.h"
 #include "build/build_config.h"
 #include "gfx/codec/png_codec.h"
 #include "gfx/font.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace {
 
 // Font sizes relative to base font.
 #if defined(OS_CHROMEOS) && defined(CROS_FONTS_USING_BCI)
 const int kSmallFontSizeDelta = -3;
@@ skipping 63 matching lines @@
 }
 
 /* static */
 ResourceBundle& ResourceBundle::GetSharedInstance() {
   // Must call InitSharedInstance before this function.
   CHECK(g_shared_instance_ != NULL);
   return *g_shared_instance_;
 }
 
 ResourceBundle::ResourceBundle()
-    : lock_(new Lock),
+    : lock_(new base::Lock),
       resources_data_(NULL),
       locale_resources_data_(NULL) {
 }
 
 void ResourceBundle::FreeImages() {
   for (SkImageMap::iterator i = skia_images_.begin();
        i != skia_images_.end(); i++) {
     delete i->second;
   }
   skia_images_.clear();
@@ skipping 26 matching lines @@
        !bytes && it != data_packs_.end(); ++it) {
     bytes = (*it)->GetStaticMemory(resource_id);
   }
 
   return bytes;
 }
 
 SkBitmap* ResourceBundle::GetBitmapNamed(int resource_id) {
   // Check to see if we already have the Skia image in the cache.
   {
-    AutoLock lock_scope(*lock_);
+    base::AutoLock lock_scope(*lock_);
     SkImageMap::const_iterator found = skia_images_.find(resource_id);
     if (found != skia_images_.end())
       return found->second;
   }
 
   scoped_ptr<SkBitmap> bitmap;
 
   bitmap.reset(LoadBitmap(resources_data_, resource_id));
 
   if (bitmap.get()) {
     // We loaded successfully.  Cache the Skia version of the bitmap.
-    AutoLock lock_scope(*lock_);
+    base::AutoLock lock_scope(*lock_);
 
     // Another thread raced us, and has already cached the skia image.
     if (skia_images_.count(resource_id))
       return skia_images_[resource_id];
 
     skia_images_[resource_id] = bitmap.get();
     return bitmap.release();
   }
 
   // We failed to retrieve the bitmap, show a debugging red square.
   {
     LOG(WARNING) << "Unable to load bitmap with id " << resource_id;
     NOTREACHED();  // Want to assert in debug mode.
 
-    AutoLock lock_scope(*lock_);  // Guard empty_bitmap initialization.
+    base::AutoLock lock_scope(*lock_);  // Guard empty_bitmap initialization.
 
     static SkBitmap* empty_bitmap = NULL;
     if (!empty_bitmap) {
       // The placeholder bitmap is bright red so people notice the problem.
       // This bitmap will be leaked, but this code should never be hit.
       empty_bitmap = new SkBitmap();
       empty_bitmap->setConfig(SkBitmap::kARGB_8888_Config, 32, 32);
       empty_bitmap->allocPixels();
       empty_bitmap->eraseARGB(255, 255, 0, 0);
     }
     return empty_bitmap;
   }
 }
 
 void ResourceBundle::LoadFontsIfNecessary() {
-  AutoLock lock_scope(*lock_);
+  base::AutoLock lock_scope(*lock_);
   if (!base_font_.get()) {
     base_font_.reset(new gfx::Font());
 
     bold_font_.reset(new gfx::Font());
     *bold_font_ =
         base_font_->DeriveFont(0, base_font_->GetStyle() | gfx::Font::BOLD);
 
     small_font_.reset(new gfx::Font());
     *small_font_ = base_font_->DeriveFont(kSmallFontSizeDelta);
 
@@ skipping 58 matching lines @@
 
 bool ResourceBundle::LoadedDataPack::GetStringPiece(
     int resource_id, base::StringPiece* data) const {
   return data_pack_->GetStringPiece(static_cast<uint32>(resource_id), data);
 }
 
 RefCountedStaticMemory* ResourceBundle::LoadedDataPack::GetStaticMemory(
     int resource_id) const {
   return data_pack_->GetStaticMemory(resource_id);
 }