diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 04:55:52 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 04:55:52 +0000 |
| commit | 20305ec6f1acf21392c2f3938a14a96f1e28e76d (patch) | |
| tree | 6eff1f7be4bad1a1362d3466f0ac59292dc51acc /chrome_frame/metrics_service.h | |
| parent | c6e8346b56ab61b35845aefcf9b241c654fe1253 (diff) | |
| download | chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.zip chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.tar.gz chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.tar.bz2 | |
Remove obsolete base/lock.h and fix up callers to use the new header file and
the base namespace. Fix several files including lock.h unnecessarily.
BUG=none
TEST=none
Original review=http://codereview.chromium.org/6142009/
Patch by leviw@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72106 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/metrics_service.h')
| -rw-r--r-- | chrome_frame/metrics_service.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/metrics_service.h b/chrome_frame/metrics_service.h index 46f39ed..5c19ba6 100644 --- a/chrome_frame/metrics_service.h +++ b/chrome_frame/metrics_service.h @@ -13,9 +13,9 @@ #include "base/basictypes.h" #include "base/lazy_instance.h" -#include "base/lock.h" #include "base/metrics/histogram.h" #include "base/scoped_ptr.h" +#include "base/synchronization/lock.h" #include "base/threading/platform_thread.h" #include "base/threading/thread_local.h" #include "chrome/common/metrics_helpers.h" @@ -148,7 +148,7 @@ class MetricsService : public MetricsServiceBase { int transmission_timer_id_; // Used to serialize the Start and Stop operations on the metrics service. - static Lock metrics_service_lock_; + static base::Lock metrics_service_lock_; DISALLOW_COPY_AND_ASSIGN(MetricsService); }; |