Revert "Fix a ton of compiler warnings."

chrome/browser/search_engines/template_url_model.h

Index: chrome/browser/search_engines/template_url_model.h
diff --git a/chrome/browser/search_engines/template_url_model.h b/chrome/browser/search_engines/template_url_model.h
index f58458078e70ffcb97e70da6de9b8daf5c8c1b37..c0e169b6dbe57958fef5f2d896d7cce79ab4f2a0 100644
--- a/chrome/browser/search_engines/template_url_model.h
+++ b/chrome/browser/search_engines/template_url_model.h
@@ -1,9 +1,9 @@
-// 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_TEMPLATE_URL_MODEL_H_
-#define CHROME_BROWSER_TEMPLATE_URL_MODEL_H_
+#ifndef CHROME_BROWSER_TEMPLATE_URL_MODEL_H__
+#define CHROME_BROWSER_TEMPLATE_URL_MODEL_H__
 
 #include <map>
 #include <string>
@@ -48,8 +48,6 @@ class TemplateURLModelObserver {
  public:
   // Notification that the template url model has changed in some way.
   virtual void OnTemplateURLModelChanged() = 0;
- protected:
-  ~TemplateURLModelObserver() {}
 };
 
 class TemplateURLModel : public WebDataServiceConsumer,
@@ -353,4 +351,4 @@ class TemplateURLModel : public WebDataServiceConsumer,
   DISALLOW_EVIL_CONSTRUCTORS(TemplateURLModel);
 };
 
-#endif  // CHROME_BROWSER_TEMPLATE_URL_MODEL_H_
+#endif  // CHROME_BROWSER_TEMPLATE_URL_MODEL_H__