summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorhans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-25 14:47:02 +0000
committerhans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-25 14:47:02 +0000
commitc64591b48b7d1b0fec802485be42f4715e85faca (patch)
tree0a73d8428b81ef1650f5b68090c782ee254aac33 /chrome
parentf9725c2cc81ff95f69b480da757439d355943ae0 (diff)
downloadchromium_src-c64591b48b7d1b0fec802485be42f4715e85faca.zip
chromium_src-c64591b48b7d1b0fec802485be42f4715e85faca.tar.gz
chromium_src-c64591b48b7d1b0fec802485be42f4715e85faca.tar.bz2
Chromeos: virtual destructors should have virtual keyword (part 4).
Nu functionality change: virtual is only added to destructors that are already implicitly virtual. BUG=83408 TEST=chromiumos clang bot goes green TBR=battre Review URL: http://codereview.chromium.org/7031049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86620 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/chromeos/login/owner_manager_unittest.cc4
-rw-r--r--chrome/browser/chromeos/login/owner_manager_unittest.h4
-rw-r--r--chrome/browser/chromeos/notifications/desktop_notifications_unittest.h2
3 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/login/owner_manager_unittest.cc b/chrome/browser/chromeos/login/owner_manager_unittest.cc
index b60d236..38c0713 100644
--- a/chrome/browser/chromeos/login/owner_manager_unittest.cc
+++ b/chrome/browser/chromeos/login/owner_manager_unittest.cc
@@ -31,6 +31,10 @@ namespace chromeos {
////////////////////////////////////////////////////////////////////////////////
// MockKeyLoadObserver
+virtual MockKeyLoadObserver::~MockKeyLoadObserver() {
+ DCHECK(observed_);
+}
+
void MockKeyLoadObserver::Observe(NotificationType type,
const NotificationSource& source,
const NotificationDetails& details) {
diff --git a/chrome/browser/chromeos/login/owner_manager_unittest.h b/chrome/browser/chromeos/login/owner_manager_unittest.h
index 0d14ad6d..e4369bf 100644
--- a/chrome/browser/chromeos/login/owner_manager_unittest.h
+++ b/chrome/browser/chromeos/login/owner_manager_unittest.h
@@ -38,9 +38,7 @@ class MockKeyLoadObserver : public NotificationObserver {
NotificationService::AllSources());
}
- virtual ~MockKeyLoadObserver() {
- DCHECK(observed_);
- }
+ virtual ~MockKeyLoadObserver();
// NotificationObserver implementation.
virtual void Observe(NotificationType type,
diff --git a/chrome/browser/chromeos/notifications/desktop_notifications_unittest.h b/chrome/browser/chromeos/notifications/desktop_notifications_unittest.h
index 5684f60..bbc4712 100644
--- a/chrome/browser/chromeos/notifications/desktop_notifications_unittest.h
+++ b/chrome/browser/chromeos/notifications/desktop_notifications_unittest.h
@@ -60,7 +60,7 @@ class MockBalloonCollection : public BalloonCollectionImpl {
class DesktopNotificationsTest : public testing::Test {
public:
DesktopNotificationsTest();
- ~DesktopNotificationsTest();
+ virtual ~DesktopNotificationsTest();
static void log(const std::string& message) {
log_output_.append(message);