Revert "Fix a ton of compiler warnings."

chrome/browser/history/history_types.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_HISTORY_TYPES_H_
-#define CHROME_BROWSER_HISTORY_HISTORY_TYPES_H_
+#ifndef CHROME_BROWSER_HISTORY_HISTORY_TYPES_H__
+#define CHROME_BROWSER_HISTORY_HISTORY_TYPES_H__
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/stack_container.h"
 #include "base/time.h"
 #include "chrome/browser/history/snippet.h"
@@ skipping 49 matching lines @@
 // dirty bits will not be in sync for these copies.
 class URLRow {
  public:
   URLRow() {
     Initialize();
   }
   explicit URLRow(const GURL& url) : url_(url) {
     // Initialize will not set the URL, so our initialization above will stay.
     Initialize();
   }
-  virtual ~URLRow() {}
 
   URLID id() const { return id_; }
   const GURL& url() const { return url_; }
 
   const std::wstring& title() const {
     return title_;
   }
   void set_title(const std::wstring& title) {
     // The title is frequently set to the same thing, so we don't bother
     // updating unless the string has changed.
@@ skipping 427 matching lines @@
 struct KeywordSearchTermVisit {
   // The time of the visit.
   base::Time time;
 
   // The search term that was used.
   std::wstring term;
 };
 
 }  // history
 
-#endif  // CHROME_BROWSER_HISTORY_HISTORY_TYPES_H_
+#endif  // CHROME_BROWSER_HISTORY_HISTORY_TYPES_H__