Revert "Fix a ton of compiler warnings."

chrome/browser/search_engines/template_url_model.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_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>
 #include <vector>
 
 #include "base/observer_list.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/notification_registrar.h"
@@ skipping 24 matching lines @@
 // TemplateURLModel takes ownership of any TemplateURL passed to it. If there
 // is a WebDataService, deletion is handled by WebDataService, otherwise
 // TemplateURLModel handles deletion.
 
 // TemplateURLModelObserver is notified whenever the set of TemplateURLs
 // are modified.
 class TemplateURLModelObserver {
  public:
   // Notification that the template url model has changed in some way.
   virtual void OnTemplateURLModelChanged() = 0;
- protected:
-  ~TemplateURLModelObserver() {}
 };
 
 class TemplateURLModel : public WebDataServiceConsumer,
                          public NotificationObserver {
  public:
   typedef std::map<std::string, std::string> QueryTerms;
 
   // Struct used for initializing the data store with fake data.
   // Each initializer is mapped to a TemplateURL.
   struct Initializer {
@@ skipping 283 matching lines @@
   // this is not used.
   scoped_ptr<TemplateURL> prefs_default_search_provider_;
 
   // ID assigned to next TemplateURL added to this model. This is an ever
   // increasing integer that is initialized from the database.
   TemplateURL::IDType next_id_;
 
   DISALLOW_EVIL_CONSTRUCTORS(TemplateURLModel);
 };
 
-#endif  // CHROME_BROWSER_TEMPLATE_URL_MODEL_H_
+#endif  // CHROME_BROWSER_TEMPLATE_URL_MODEL_H__