Revert "Fix a ton of compiler warnings."

chrome/common/worker_thread_ticker.h

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2008 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>
 
 #include "base/lock.h"
 #include "base/thread.h"
 
 // This class provides the following functionality:
 // It invokes a set of registered handlers at periodic intervals in
 // the context of an arbitrary worker thread.
 // The timer runs on a separate thread, so it will run even if the current
 // thread is hung. Similarly, the callbacks will be called on a separate
 // thread so they won't block the main thread.
 class WorkerThreadTicker {
  public:
   // This callback interface to be implemented by clients of this
   // class
   class Callback {
    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
   // registered handlers (in milliseconds)
   explicit WorkerThreadTicker(int tick_interval);
 
   ~WorkerThreadTicker();
 
   // Registers a callback handler interface
   // tick_handler is the handler interface to register. The ownership of this
@@ skipping 40 matching lines @@
 
   // The interval at which the callbacks are to be invoked
   int tick_interval_;
 
   // A list that holds all registered callback interfaces
   TickHandlerListType tick_handler_list_;
 
   DISALLOW_COPY_AND_ASSIGN(WorkerThreadTicker);
 };
 
-#endif  // CHROME_COMMON_WORKER_THREAD_TICKER_H_
+#endif  // CHROME_COMMON_WORKER_THREAD_TICKER_H__