Remove lock.h from resource_bundle.h and histogram.h.

Use a scoped_ptr<Lock> instead of Lock in resource bundle.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/3038005

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

6 files changed, 18 insertions, 11 deletions

diff --git a/app/resource_bundle.cc b/app/resource_bundle.cc
index d61e83d..c125907 100644
--- a/app/resource_bundle.cc
+++ b/app/resource_bundle.cc
@@ -5,6 +5,7 @@
 #include "app/resource_bundle.h"
 
 #include "base/data_pack.h"
+#include "base/lock.h"
 #include "base/logging.h"
 #include "base/string_piece.h"
 #include "build/build_config.h"
@@ -75,7 +76,8 @@ ResourceBundle& ResourceBundle::GetSharedInstance() {
 }
 
 ResourceBundle::ResourceBundle()
-    : resources_data_(NULL),
+    : lock_(new Lock),
+      resources_data_(NULL),
       locale_resources_data_(NULL) {
 }
 
@@ -121,7 +123,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_);
+    AutoLock lock_scope(*lock_);
     SkImageMap::const_iterator found = skia_images_.find(resource_id);
     if (found != skia_images_.end())
       return found->second;
@@ -133,7 +135,7 @@ SkBitmap* ResourceBundle::GetBitmapNamed(int resource_id) {
 
   if (bitmap.get()) {
     // We loaded successfully.  Cache the Skia version of the bitmap.
-    AutoLock lock_scope(lock_);
+    AutoLock lock_scope(*lock_);
 
     // Another thread raced us, and has already cached the skia image.
     if (skia_images_.count(resource_id))
@@ -148,7 +150,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.
+    AutoLock lock_scope(*lock_);  // Guard empty_bitmap initialization.
 
     static SkBitmap* empty_bitmap = NULL;
     if (!empty_bitmap) {
@@ -164,7 +166,7 @@ SkBitmap* ResourceBundle::GetBitmapNamed(int resource_id) {
 }
 
 void ResourceBundle::LoadFontsIfNecessary() {
-  AutoLock lock_scope(lock_);
+  AutoLock lock_scope(*lock_);
   if (!base_font_.get()) {
     base_font_.reset(new gfx::Font());
 
diff --git a/app/resource_bundle.h b/app/resource_bundle.h
index e2ec86c..a8c1cf7 100644
--- a/app/resource_bundle.h
+++ b/app/resource_bundle.h
@@ -17,7 +17,6 @@
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
-#include "base/lock.h"
 #include "base/ref_counted_memory.h"
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
@@ -31,6 +30,7 @@ typedef struct _GdkPixbuf GdkPixbuf;
 namespace gfx {
 class Font;
 }
+class Lock;
 class SkBitmap;
 typedef uint32 SkColor;
 namespace base {
@@ -232,7 +232,7 @@ class ResourceBundle {
 
   // Class level lock.  Used to protect internal data structures that may be
   // accessed from other threads (e.g., skia_images_).
-  Lock lock_;
+  scoped_ptr<Lock> lock_;
 
   // Handles for data sources.
   DataHandle resources_data_;
diff --git a/app/resource_bundle_dummy.cc b/app/resource_bundle_dummy.cc
index 6baa1a8..f5db317 100644
--- a/app/resource_bundle_dummy.cc
+++ b/app/resource_bundle_dummy.cc
@@ -6,6 +6,7 @@
 
 #include <windows.h>
 
+#include "base/lock.h"
 #include "base/logging.h"
 #include "base/win_util.h"
 #include "gfx/font.h"
@@ -46,7 +47,8 @@ ResourceBundle& ResourceBundle::GetSharedInstance() {
 }
 
 ResourceBundle::ResourceBundle()
-    : resources_data_(NULL),
+    : lock_(new Lock),
+      resources_data_(NULL),
       locale_resources_data_(NULL) {
 }
 
diff --git a/app/resource_bundle_linux.cc b/app/resource_bundle_linux.cc
index 7ebe4e6..a137a92 100644
--- a/app/resource_bundle_linux.cc
+++ b/app/resource_bundle_linux.cc
@@ -13,6 +13,7 @@
 #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"
@@ -91,7 +92,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_);
+    AutoLock lock_scope(*lock_);
     GdkPixbufMap::const_iterator found = gdk_pixbufs_.find(key);
     if (found != gdk_pixbufs_.end())
       return found->second;
@@ -103,7 +104,7 @@ GdkPixbuf* ResourceBundle::GetPixbufImpl(int resource_id, bool rtl_enabled) {
 
   // We loaded successfully.  Cache the pixbuf.
   if (pixbuf) {
-    AutoLock lock_scope(lock_);
+    AutoLock lock_scope(*lock_);
 
     // Another thread raced us, and has already cached the pixbuf.
     if (gdk_pixbufs_.count(key)) {
@@ -120,7 +121,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.
+    AutoLock lock_scope(*lock_);  // Guard empty_bitmap initialization.
 
     static GdkPixbuf* empty_bitmap = NULL;
     if (!empty_bitmap) {
diff --git a/app/resource_bundle_posix.cc b/app/resource_bundle_posix.cc
index cdd9ee2..1ee5fd1 100644
--- a/app/resource_bundle_posix.cc
+++ b/app/resource_bundle_posix.cc
@@ -6,6 +6,7 @@
 
 #include "app/l10n_util.h"
 #include "base/data_pack.h"
+#include "base/lock.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "base/string16.h"
diff --git a/app/resource_bundle_win.cc b/app/resource_bundle_win.cc
index 498cec6..f143193 100644
--- a/app/resource_bundle_win.cc
+++ b/app/resource_bundle_win.cc
@@ -11,6 +11,7 @@
 #include "base/data_pack.h"
 #include "base/debug_util.h"
 #include "base/file_util.h"
+#include "base/lock.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/resource_util.h"