Revert "Fix a ton of compiler warnings."

This reverts commit r24792.

TBR=estade

Review URL: http://codereview.chromium.org/179028


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24796 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 4 insertions, 34 deletions

diff --git a/chrome/browser/renderer_host/render_view_host_delegate.h b/chrome/browser/renderer_host/render_view_host_delegate.h
index 916ff9db..2727879 100644
--- a/chrome/browser/renderer_host/render_view_host_delegate.h
+++ b/chrome/browser/renderer_host/render_view_host_delegate.h
@@ -136,9 +136,6 @@ class RenderViewHostDelegate {
 
     // The content's intrinsic width (prefWidth) changed.
     virtual void UpdatePreferredWidth(int pref_width) = 0;
-
-   protected:
-    ~View() {}
   };
 
   // RendererManagerment -------------------------------------------------------
@@ -164,9 +161,6 @@ class RenderViewHostDelegate {
     // Called the ResourceDispatcherHost's associate CrossSiteRequestHandler
     // when a cross-site navigation has been canceled.
     virtual void OnCrossSiteNavigationCanceled() = 0;
-
-   protected:
-    ~RendererManagement() {}
   };
 
   // BrowserIntegration --------------------------------------------------------
@@ -213,9 +207,6 @@ class RenderViewHostDelegate {
     virtual void OnDidGetApplicationInfo(
         int32 page_id,
         const webkit_glue::WebApplicationInfo& app_info) = 0;
-
-   protected:
-    ~BrowserIntegration() {}
   };
 
   // Resource ------------------------------------------------------------------
@@ -272,9 +263,6 @@ class RenderViewHostDelegate {
 
     // Notification that a document has been loaded in a frame.
     virtual void DocumentLoadedInFrame() = 0;
-
-   protected:
-    ~Resource() {}
   };
 
   // Save ----------------------------------------------------------------------
@@ -300,9 +288,6 @@ class RenderViewHostDelegate {
     virtual void OnReceivedSerializedHtmlData(const GURL& frame_url,
                                               const std::string& data,
                                               int32 status) = 0;
-
-   protected:
-    ~Save() {}
   };
 
   // Printing ------------------------------------------------------------------
@@ -318,9 +303,6 @@ class RenderViewHostDelegate {
     // EMF memory mapped data.
     virtual void DidPrintPage(
         const ViewHostMsg_DidPrintPage_Params& params) = 0;
-
-   protected:
-    ~Printing() {}
   };
 
   // FavIcon -------------------------------------------------------------------
@@ -344,9 +326,6 @@ class RenderViewHostDelegate {
     virtual void UpdateFavIconURL(RenderViewHost* render_view_host,
                                   int32 page_id,
                                   const GURL& icon_url) = 0;
-
-   protected:
-    ~FavIcon() {}
   };
 
   // AutoFill ------------------------------------------------------------------
@@ -373,9 +352,6 @@ class RenderViewHostDelegate {
     // autofill suggestion from the database.
     virtual void RemoveAutofillEntry(const std::wstring& field_name,
                                      const std::wstring& value) = 0;
-
-   protected:
-    ~Autofill() {}
   };
 
   // ---------------------------------------------------------------------------
@@ -421,7 +397,7 @@ class RenderViewHostDelegate {
 
   // The RenderView is going to be deleted. This is called when each
   // RenderView is going to be destroyed
-  virtual void RenderViewDeleted(RenderViewHost* render_view_host) {}
+  virtual void RenderViewDeleted(RenderViewHost* render_view_host) { }
 
   // The RenderView was navigated to a different page.
   virtual void DidNavigate(RenderViewHost* render_view_host,
@@ -566,9 +542,6 @@ class RenderViewHostDelegate {
 
   // The RenderView has inserted one css file into page.
   virtual void DidInsertCSS() {}
-
- protected:
-  ~RenderViewHostDelegate() {}
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_DELEGATE_H_
diff --git a/chrome/browser/renderer_host/render_widget_host.cc b/chrome/browser/renderer_host/render_widget_host.cc
index 2397c79..40fba47 100644
--- a/chrome/browser/renderer_host/render_widget_host.cc
+++ b/chrome/browser/renderer_host/render_widget_host.cc
@@ -96,7 +96,7 @@ RenderWidgetHost::~RenderWidgetHost() {
 gfx::NativeViewId RenderWidgetHost::GetNativeViewId() {
   if (view_)
     return gfx::IdFromNativeView(view_->GetNativeView());
-  return 0;
+  return NULL;
 }
 
 void RenderWidgetHost::Init() {
diff --git a/chrome/browser/renderer_host/render_widget_host_painting_observer.h b/chrome/browser/renderer_host/render_widget_host_painting_observer.h
index 652ec47..d24b61a 100644
--- a/chrome/browser/renderer_host/render_widget_host_painting_observer.h
+++ b/chrome/browser/renderer_host/render_widget_host_painting_observer.h
@@ -19,9 +19,6 @@ class RenderWidgetHostPaintingObserver {
 
   // Indicates that the RenderWidgetHost just updated the backing store.
   virtual void WidgetDidUpdateBackingStore(RenderWidgetHost* widget) = 0;
-
- protected:
-  ~RenderWidgetHostPaintingObserver() {}
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_PAINTING_OBSERVER_H_
diff --git a/chrome/browser/renderer_host/resource_message_filter.cc b/chrome/browser/renderer_host/resource_message_filter.cc
index 8df6c4c..c8183bb 100644
--- a/chrome/browser/renderer_host/resource_message_filter.cc
+++ b/chrome/browser/renderer_host/resource_message_filter.cc
@@ -1,4 +1,4 @@
-// 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.
 
@@ -735,7 +735,7 @@ void ResourceMessageFilter::OnGetDefaultPrintSettings(IPC::Message* reply_msg) {
   // Loads default settings. This is asynchronous, only the IPC message sender
   // will hang until the settings are retrieved.
   printer_query->GetSettings(printing::PrinterQuery::DEFAULTS,
-                             0,
+                             NULL,
                              0,
                              false,
                              task);