7 files changed, 26 insertions, 16 deletions
diff --git a/chrome/common/child_process_host.cc b/chrome/common/child_process_host.cc
index cf67d15..0cc76fa 100644
--- a/chrome/common/child_process_host.cc
+++ b/chrome/common/child_process_host.cc
@@ -206,7 +206,7 @@ void ChildProcessHost::OnChildDied() {
 
   // On POSIX, once we've called DidProcessCrash, handle() is no longer
   // valid.  Ensure the destructor doesn't try to use it.
-  set_handle(NULL);
+  set_handle(0);
 
   delete this;
 }
diff --git a/chrome/common/extensions/extension_unittest.cc b/chrome/common/extensions/extension_unittest.cc
index fb40330..09b320b 100644
--- a/chrome/common/extensions/extension_unittest.cc
+++ b/chrome/common/extensions/extension_unittest.cc
@@ -293,7 +293,7 @@ TEST(ExtensionTest, LoadPageActionHelper) {
   DictionaryValue input;
 
   // First try with an empty dictionary. We should get nothing back.
-  ASSERT_EQ(NULL, extension.LoadPageActionHelper(&input, 0, &error_msg));
+  ASSERT_TRUE(NULL == extension.LoadPageActionHelper(&input, 0, &error_msg));
   ASSERT_STRNE("", error_msg.c_str());
   error_msg = "";
 
diff --git a/chrome/common/gtk_tree.h b/chrome/common/gtk_tree.h
index 8caa64c..4e74efa 100644
--- a/chrome/common/gtk_tree.h
+++ b/chrome/common/gtk_tree.h
@@ -43,6 +43,9 @@ class ModelAdapter : 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:
+    ~Delegate() {}
   };
 
   // |table_model| may be NULL.
diff --git a/chrome/common/property_bag_unittest.cc b/chrome/common/property_bag_unittest.cc
index 51db07c..6dca90c 100644
--- a/chrome/common/property_bag_unittest.cc
+++ b/chrome/common/property_bag_unittest.cc
@@ -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.
 
@@ -10,7 +10,7 @@ TEST(PropertyBagTest, AddQueryRemove) {
   PropertyAccessor<int> adaptor;
 
   // Should be no match initially.
-  EXPECT_EQ(NULL, adaptor.GetProperty(&bag));
+  EXPECT_TRUE(NULL == adaptor.GetProperty(&bag));
 
   // Add the value and make sure we get it back.
   const int kFirstValue = 1;
@@ -26,7 +26,7 @@ TEST(PropertyBagTest, AddQueryRemove) {
 
   // Remove the value and make sure it's gone.
   adaptor.DeleteProperty(&bag);
-  EXPECT_EQ(NULL, adaptor.GetProperty(&bag));
+  EXPECT_TRUE(NULL == adaptor.GetProperty(&bag));
 }
 
 TEST(PropertyBagTest, Copy) {
@@ -57,6 +57,6 @@ TEST(PropertyBagTest, Copy) {
 
   // Clear it out, neither property should be left.
   copy = PropertyBag();
-  EXPECT_EQ(NULL, adaptor1.GetProperty(&copy));
-  EXPECT_EQ(NULL, adaptor2.GetProperty(&copy));
+  EXPECT_TRUE(NULL == adaptor1.GetProperty(&copy));
+  EXPECT_TRUE(NULL == adaptor2.GetProperty(&copy));
 }
diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h
index 47e0e86..0506afc 100644
--- a/chrome/common/temp_scaffolding_stubs.h
+++ b/chrome/common/temp_scaffolding_stubs.h
@@ -64,9 +64,9 @@ namespace printing {
 
 class PrintViewManager : public RenderViewHostDelegate::Printing {
  public:
-  PrintViewManager(TabContents&) { }
+  PrintViewManager(TabContents&) {}
   void Stop() { NOTIMPLEMENTED(); }
-  void Destroy() { }
+  void Destroy() {}
   bool OnRenderViewGone(RenderViewHost*) {
     NOTIMPLEMENTED();
     return true;  // Assume for now that all renderer crashes are important.
@@ -115,7 +115,7 @@ class PrinterQuery : public base::RefCountedThreadSafe<PrinterQuery> {
 
 class PrintJobManager {
  public:
-  void OnQuit() { }
+  void OnQuit() {}
   void PopPrinterQuery(int document_cookie, scoped_refptr<PrinterQuery>* job) {
     NOTIMPLEMENTED();
   }
@@ -150,8 +150,9 @@ class DockInfo {
 
 class RepostFormWarningDialog {
  public:
-  static void RunRepostFormWarningDialog(NavigationController*) { }
-  virtual ~RepostFormWarningDialog() { }
+  static void RunRepostFormWarningDialog(NavigationController*) {}
+ protected:
+  ~RepostFormWarningDialog() {}
 };
 
 class BaseDragSource {
diff --git a/chrome/common/worker_thread_ticker.h b/chrome/common/worker_thread_ticker.h
index bbc5380..ceb2903 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:
+    ~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 09b1c2b..abe9f32e 100644
--- a/chrome/common/x11_util.h
+++ b/chrome/common/x11_util.h
@@ -74,6 +74,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:
+  ~EnumerateWindowsDelegate() {}
 };
 
 // Enumerates all windows in the current display.  Will recurse into child