summaryrefslogtreecommitdiffstats
path: root/chrome/browser/metrics
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/metrics')
-rw-r--r--chrome/browser/metrics/metrics_service.cc4
-rw-r--r--chrome/browser/metrics/thread_watcher.cc4
-rw-r--r--chrome/browser/metrics/thread_watcher_unittest.cc12
-rw-r--r--chrome/browser/metrics/variations/resource_request_allowed_notifier_unittest.cc2
4 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc
index be0574e..8858606 100644
--- a/chrome/browser/metrics/metrics_service.cc
+++ b/chrome/browser/metrics/metrics_service.cc
@@ -423,12 +423,12 @@ class MetricsMemoryDetails : public MemoryDetails {
explicit MetricsMemoryDetails(const base::Closure& callback)
: callback_(callback) {}
- virtual void OnDetailsAvailable() {
+ virtual void OnDetailsAvailable() OVERRIDE {
MessageLoop::current()->PostTask(FROM_HERE, callback_);
}
private:
- ~MetricsMemoryDetails() {}
+ virtual ~MetricsMemoryDetails() {}
base::Closure callback_;
DISALLOW_COPY_AND_ASSIGN(MetricsMemoryDetails);
diff --git a/chrome/browser/metrics/thread_watcher.cc b/chrome/browser/metrics/thread_watcher.cc
index c0b7616..043dfce 100644
--- a/chrome/browser/metrics/thread_watcher.cc
+++ b/chrome/browser/metrics/thread_watcher.cc
@@ -812,7 +812,7 @@ class StartupWatchDogThread : public base::Watchdog {
// Alarm is called if the time expires after an Arm() without someone calling
// Disarm(). When Alarm goes off, in release mode we get the crash dump
// without crashing and in debug mode we break into the debugger.
- virtual void Alarm() {
+ virtual void Alarm() OVERRIDE {
#ifndef NDEBUG
DCHECK(false);
#else
@@ -836,7 +836,7 @@ class ShutdownWatchDogThread : public base::Watchdog {
// Alarm is called if the time expires after an Arm() without someone calling
// Disarm(). We crash the browser if this method is called.
- virtual void Alarm() {
+ virtual void Alarm() OVERRIDE {
CHECK(false);
}
diff --git a/chrome/browser/metrics/thread_watcher_unittest.cc b/chrome/browser/metrics/thread_watcher_unittest.cc
index d39e23c..c5e1ad6 100644
--- a/chrome/browser/metrics/thread_watcher_unittest.cc
+++ b/chrome/browser/metrics/thread_watcher_unittest.cc
@@ -117,32 +117,32 @@ class CustomThreadWatcher : public ThreadWatcher {
return old_state;
}
- void ActivateThreadWatching() {
+ virtual void ActivateThreadWatching() OVERRIDE {
State old_state = UpdateState(ACTIVATED);
EXPECT_EQ(old_state, INITIALIZED);
ThreadWatcher::ActivateThreadWatching();
}
- void DeActivateThreadWatching() {
+ virtual void DeActivateThreadWatching() OVERRIDE {
State old_state = UpdateState(DEACTIVATED);
EXPECT_TRUE(old_state == ACTIVATED || old_state == SENT_PING ||
old_state == RECEIVED_PONG);
ThreadWatcher::DeActivateThreadWatching();
}
- void PostPingMessage() {
+ virtual void PostPingMessage() OVERRIDE {
State old_state = UpdateState(SENT_PING);
EXPECT_TRUE(old_state == ACTIVATED || old_state == RECEIVED_PONG);
ThreadWatcher::PostPingMessage();
}
- void OnPongMessage(uint64 ping_sequence_number) {
+ virtual void OnPongMessage(uint64 ping_sequence_number) OVERRIDE {
State old_state = UpdateState(RECEIVED_PONG);
EXPECT_TRUE(old_state == SENT_PING || old_state == DEACTIVATED);
ThreadWatcher::OnPongMessage(ping_sequence_number);
}
- void OnCheckResponsiveness(uint64 ping_sequence_number) {
+ virtual void OnCheckResponsiveness(uint64 ping_sequence_number) OVERRIDE {
ThreadWatcher::OnCheckResponsiveness(ping_sequence_number);
{
base::AutoLock auto_lock(custom_lock_);
@@ -297,7 +297,7 @@ class ThreadWatcherTest : public ::testing::Test {
}
}
- ~ThreadWatcherTest() {
+ virtual ~ThreadWatcherTest() {
ThreadWatcherList::DeleteAll();
io_watcher_ = NULL;
webkit_watcher_ = NULL;
diff --git a/chrome/browser/metrics/variations/resource_request_allowed_notifier_unittest.cc b/chrome/browser/metrics/variations/resource_request_allowed_notifier_unittest.cc
index ba8800f..f75f59d 100644
--- a/chrome/browser/metrics/variations/resource_request_allowed_notifier_unittest.cc
+++ b/chrome/browser/metrics/variations/resource_request_allowed_notifier_unittest.cc
@@ -56,7 +56,7 @@ class ResourceRequestAllowedNotifierTest
#endif
resource_request_allowed_notifier_.Init(this);
}
- ~ResourceRequestAllowedNotifierTest() { }
+ virtual ~ResourceRequestAllowedNotifierTest() { }
bool was_notified() const { return was_notified_; }