summaryrefslogtreecommitdiffstats
path: root/chrome/tools
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/tools')
-rw-r--r--chrome/tools/crash_service/crash_service.cc6
-rw-r--r--chrome/tools/crash_service/crash_service.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome/tools/crash_service/crash_service.cc b/chrome/tools/crash_service/crash_service.cc
index 4697e92..e672880 100644
--- a/chrome/tools/crash_service/crash_service.cc
+++ b/chrome/tools/crash_service/crash_service.cc
@@ -162,7 +162,7 @@ CrashService::CrashService(const std::wstring& report_dir)
}
CrashService::~CrashService() {
- AutoLock lock(sending_);
+ base::AutoLock lock(sending_);
delete dumper_;
delete sender_;
}
@@ -316,7 +316,7 @@ void CrashService::OnClientExited(void* context,
// thread takes the sending_ lock, so the sleep is just to give it a
// chance to start.
::Sleep(1000);
- AutoLock lock(self->sending_);
+ base::AutoLock lock(self->sending_);
// Some people can restart chrome very fast, check again if we have
// a new client before exiting for real.
if (self->clients_connected_ == self->clients_terminated_) {
@@ -396,7 +396,7 @@ unsigned long CrashService::AsyncSendDump(void* context) {
{
// Take the server lock while sending. This also prevent early
// termination of the service object.
- AutoLock lock(info->self->sending_);
+ base::AutoLock lock(info->self->sending_);
VLOG(1) << "trying to send report for pid = " << info->pid;
google_breakpad::ReportResult send_result
= info->self->sender_->SendCrashReport(kCrashReportURL, info->map,
diff --git a/chrome/tools/crash_service/crash_service.h b/chrome/tools/crash_service/crash_service.h
index 2d4c472..82bc4be 100644
--- a/chrome/tools/crash_service/crash_service.h
+++ b/chrome/tools/crash_service/crash_service.h
@@ -10,7 +10,7 @@
#include "base/basictypes.h"
#include "base/file_path.h"
-#include "base/lock.h"
+#include "base/synchronization/lock.h"
namespace google_breakpad {
@@ -109,7 +109,7 @@ class CrashService {
int requests_sent_;
volatile long clients_connected_;
volatile long clients_terminated_;
- Lock sending_;
+ base::Lock sending_;
DISALLOW_COPY_AND_ASSIGN(CrashService);
};