Move base/lock and base/condition_variable to base/synchronization/

I kept a base/lock.h in place with a using statement to avoid updating
all callers in one CL.

TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/6018013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70363 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 2 deletions

diff --git a/app/resource_bundle.h b/app/resource_bundle.h
index d2c2d59..abe7205 100644
--- a/app/resource_bundle.h
+++ b/app/resource_bundle.h
@@ -26,13 +26,15 @@
 namespace app {
 class DataPack;
 }
+namespace base {
+class Lock;
+}
 #if defined(USE_X11)
 typedef struct _GdkPixbuf GdkPixbuf;
 #endif
 namespace gfx {
 class Font;
 }
-class Lock;
 class SkBitmap;
 typedef uint32 SkColor;
 namespace base {
@@ -244,7 +246,7 @@ class ResourceBundle {
 
   // Class level lock.  Used to protect internal data structures that may be
   // accessed from other threads (e.g., skia_images_).
-  scoped_ptr<Lock> lock_;
+  scoped_ptr<base::Lock> lock_;
 
   // Handles for data sources.
   DataHandle resources_data_;