5 files changed, 20 insertions, 5 deletions
diff --git a/chrome/common/gtk_tree.h b/chrome/common/gtk_tree.h
index b0759f2..2b2f893 100644
--- a/chrome/common/gtk_tree.h
+++ b/chrome/common/gtk_tree.h
@@ -55,6 +55,9 @@ class TableAdapter : public TableModelObserver {
     // after clearing the list store.  Can be overriden by the delegate if it
     // needs to do extra initialization before the list store is populated.
     virtual void OnModelChanged() {}
+
+   protected:
+    virtual ~Delegate() {}
   };
 
   // |table_model| may be NULL.
diff --git a/chrome/common/worker_thread_ticker.h b/chrome/common/worker_thread_ticker.h
index bbc5380..bb39c3b 100644
--- a/chrome/common/worker_thread_ticker.h
+++ b/chrome/common/worker_thread_ticker.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_WORKER_THREAD_TICKER_H__
-#define CHROME_COMMON_WORKER_THREAD_TICKER_H__
+#ifndef CHROME_COMMON_WORKER_THREAD_TICKER_H_
+#define CHROME_COMMON_WORKER_THREAD_TICKER_H_
 
 #include <vector>
 
@@ -24,6 +24,9 @@ class WorkerThreadTicker {
    public:
     // Gets invoked when the timer period is up
     virtual void OnTick() = 0;
+
+   protected:
+    virtual ~Callback() {}
   };
 
   // tick_interval is the periodic interval in which to invoke the
@@ -84,4 +87,4 @@ class WorkerThreadTicker {
   DISALLOW_COPY_AND_ASSIGN(WorkerThreadTicker);
 };
 
-#endif  // CHROME_COMMON_WORKER_THREAD_TICKER_H__
+#endif  // CHROME_COMMON_WORKER_THREAD_TICKER_H_
diff --git a/chrome/common/x11_util.h b/chrome/common/x11_util.h
index aed7bad..3f2a92f 100644
--- a/chrome/common/x11_util.h
+++ b/chrome/common/x11_util.h
@@ -83,6 +83,9 @@ class EnumerateWindowsDelegate {
   // |xid| is the X Window ID of the enumerated window.  Return true to stop
   // further iteration.
   virtual bool ShouldStopIterating(XID xid) = 0;
+
+ protected:
+  virtual ~EnumerateWindowsDelegate() {}
 };
 
 // Enumerates all windows in the current display.  Will recurse into child
diff --git a/chrome/renderer/audio_message_filter.h b/chrome/renderer/audio_message_filter.h
index 9a21046..8d1a0b5 100644
--- a/chrome/renderer/audio_message_filter.h
+++ b/chrome/renderer/audio_message_filter.h
@@ -32,6 +32,9 @@ class AudioMessageFilter : public IPC::ChannelProxy::MessageFilter {
     // Called when notification of stream volume is received from the browser
     // process.
     virtual void OnVolume(double volume) = 0;
+
+   protected:
+    virtual ~Delegate() {}
   };
 
   explicit AudioMessageFilter(int32 route_id);
diff --git a/chrome/test/automation/tab_proxy.h b/chrome/test/automation/tab_proxy.h
index 61ab571..b811b70 100644
--- a/chrome/test/automation/tab_proxy.h
+++ b/chrome/test/automation/tab_proxy.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -44,6 +44,9 @@ class TabProxy : public AutomationResourceProxy {
   class TabProxyDelegate {
    public:
     virtual void OnMessageReceived(TabProxy* tab, const IPC::Message& msg) {}
+
+   protected:
+    virtual ~TabProxyDelegate() {}
   };
 
   TabProxy(AutomationMessageSender* sender,