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

app/resource_bundle_linux.cc

Index: app/resource_bundle_linux.cc
diff --git a/app/resource_bundle_linux.cc b/app/resource_bundle_linux.cc
index 18d994f70572deca5ad830cca9576ef1b647ff3c..cd3f9ec9d80e404f7cf164161f94fd5c03c7d57d 100644
--- a/app/resource_bundle_linux.cc
+++ b/app/resource_bundle_linux.cc
@@ -11,11 +11,11 @@
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/i18n/rtl.h"
-#include "base/lock.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
+#include "base/synchronization/lock.h"
 #include "gfx/font.h"
 #include "gfx/gtk_util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ -90,7 +90,7 @@ GdkPixbuf* ResourceBundle::GetPixbufImpl(int resource_id, bool rtl_enabled) {
 
   // Check to see if we already have the pixbuf in the cache.
   {
-    AutoLock lock_scope(*lock_);
+    base::AutoLock lock_scope(*lock_);
     GdkPixbufMap::const_iterator found = gdk_pixbufs_.find(key);
     if (found != gdk_pixbufs_.end())
       return found->second;
@@ -102,7 +102,7 @@ GdkPixbuf* ResourceBundle::GetPixbufImpl(int resource_id, bool rtl_enabled) {
 
   // We loaded successfully.  Cache the pixbuf.
   if (pixbuf) {
-    AutoLock lock_scope(*lock_);
+    base::AutoLock lock_scope(*lock_);
 
     // Another thread raced us, and has already cached the pixbuf.
     if (gdk_pixbufs_.count(key)) {
@@ -119,7 +119,7 @@ GdkPixbuf* ResourceBundle::GetPixbufImpl(int resource_id, bool rtl_enabled) {
     LOG(WARNING) << "Unable to load GdkPixbuf 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 GdkPixbuf* empty_bitmap = NULL;
     if (!empty_bitmap) {