Revert "Fix a ton of compiler warnings."

chrome/browser/history/expire_history_backend.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_BROWSER_HISTORY_EXPIRE_HISTORY_BACKEND_H_
-#define CHROME_BROWSER_HISTORY_EXPIRE_HISTORY_BACKEND_H_
+#ifndef CHROME_BROWSER_HISTORY_EXPIRE_HISTORY_BACKEND_H__
+#define CHROME_BROWSER_HISTORY_EXPIRE_HISTORY_BACKEND_H__
 
 #include <queue>
 #include <set>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/task.h"
 #include "base/time.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/history/history_types.h"
@@ skipping 12 matching lines @@
 class TextDatabaseManager;
 class ThumbnailDatabase;
 
 // Delegate used to broadcast notifications to the main thread.
 class BroadcastNotificationDelegate {
  public:
   // Schedules a broadcast of the given notification on the application main
   // thread. The details argument will have ownership taken by this function.
   virtual void BroadcastNotifications(NotificationType type,
                                       HistoryDetails* details_deleted) = 0;
-
- protected:
-  ~BroadcastNotificationDelegate() {}
 };
 
 // Encapsulates visit expiration criteria and type of visits to expire.
 class ExpiringVisitsReader {
  public:
   virtual ~ExpiringVisitsReader() {}
   // Populates |visits| from |db|, using provided |end_time| and |max_visits|
   // cap.
   virtual bool Read(base::Time end_time, HistoryDatabase* db,
                     VisitVector* visits, int max_visits) const = 0;
@@ skipping 221 matching lines @@
   //
   // Use GetBookmarkService to access this, which makes sure the service is
   // loaded.
   BookmarkService* bookmark_service_;
 
   DISALLOW_EVIL_CONSTRUCTORS(ExpireHistoryBackend);
 };
 
 }  // namespace history
 
-#endif  // CHROME_BROWSER_HISTORY_EXPIRE_HISTORY_BACKEND_H_
+#endif  // CHROME_BROWSER_HISTORY_EXPIRE_HISTORY_BACKEND_H__