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

app/resource_bundle.cc

Index: app/resource_bundle.cc
diff --git a/app/resource_bundle.cc b/app/resource_bundle.cc
index b0e79ed93ecfdaded07fcd8aa978b96255c69c0b..6920994f8eee682c698101a7cc8051cad32c2052 100644
--- a/app/resource_bundle.cc
+++ b/app/resource_bundle.cc
@@ -5,9 +5,9 @@
 #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"
@@ -91,7 +91,7 @@ ResourceBundle& ResourceBundle::GetSharedInstance() {
 }
 
 ResourceBundle::ResourceBundle()
-    : lock_(new Lock),
+    : lock_(new base::Lock),
       resources_data_(NULL),
       locale_resources_data_(NULL) {
 }
@@ -138,7 +138,7 @@ RefCountedStaticMemory* ResourceBundle::LoadDataResourceBytes(
 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;
@@ -150,7 +150,7 @@ SkBitmap* ResourceBundle::GetBitmapNamed(int 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))
@@ -165,7 +165,7 @@ SkBitmap* ResourceBundle::GetBitmapNamed(int resource_id) {
     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) {
@@ -181,7 +181,7 @@ SkBitmap* ResourceBundle::GetBitmapNamed(int resource_id) {
 }
 
 void ResourceBundle::LoadFontsIfNecessary() {
-  AutoLock lock_scope(*lock_);
+  base::AutoLock lock_scope(*lock_);
   if (!base_font_.get()) {
     base_font_.reset(new gfx::Font());