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

5 files changed, 11 insertions, 14 deletions

diff --git a/chrome/renderer/audio_message_filter.h b/chrome/renderer/audio_message_filter.h
index 3052330..04ff699 100644
--- a/chrome/renderer/audio_message_filter.h
+++ b/chrome/renderer/audio_message_filter.h
@@ -32,9 +32,6 @@ class AudioMessageFilter : public IPC::ChannelProxy::MessageFilter {
     // Called when notification of stream volume is received from the browser
     // process.
     virtual void OnVolume(double left, double right) = 0;
-
-   protected:
-    ~Delegate() {}
   };
 
   AudioMessageFilter(int32 route_id);
diff --git a/chrome/renderer/print_web_view_helper_linux.cc b/chrome/renderer/print_web_view_helper_linux.cc
index fef1eb6..0fb7ffc 100644
--- a/chrome/renderer/print_web_view_helper_linux.cc
+++ b/chrome/renderer/print_web_view_helper_linux.cc
@@ -26,15 +26,15 @@ void PrintWebViewHelper::Print(WebFrame* frame, bool script_initiated) {
   //   Top = 0.25 in.
   //   Bottom = 0.56 in.
   const int kDPI = 72;
-  const int kWidth = static_cast<int>((8.5-0.25-0.25) * kDPI);
-  const int kHeight = static_cast<int>((11-0.25-0.56) * kDPI);
+  const int kWidth = (8.5-0.25-0.25) * kDPI;
+  const int kHeight = (11-0.25-0.56) * kDPI;
   ViewMsg_Print_Params default_settings;
   default_settings.printable_size = gfx::Size(kWidth, kHeight);
   default_settings.dpi = kDPI;
   default_settings.min_shrink = 1.25;
   default_settings.max_shrink = 2.0;
   default_settings.desired_dpi = kDPI;
-  default_settings.document_cookie = 0;
+  default_settings.document_cookie = NULL;
   default_settings.selection_only = false;
 
   // Calculate the estimated page count.
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index b7e17b6..48caa47 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -1884,7 +1884,7 @@ WebView* RenderView::CreateWebView(WebView* webview,
       (true, false);
 #endif
   RenderView* view = RenderView::Create(render_thread_,
-                                        0, waitable_event, routing_id_,
+                                        NULL, waitable_event, routing_id_,
                                         renderer_preferences_,
                                         webkit_preferences_,
                                         shared_popup_counter_, routing_id);
diff --git a/chrome/renderer/render_widget.cc b/chrome/renderer/render_widget.cc
index 1212e07..6a6c0a4 100644
--- a/chrome/renderer/render_widget.cc
+++ b/chrome/renderer/render_widget.cc
@@ -46,7 +46,7 @@ RenderWidget::RenderWidget(RenderThreadBase* render_thread, bool activatable)
       webwidget_(NULL),
       opener_id_(MSG_ROUTING_NONE),
       render_thread_(render_thread),
-      host_window_(0),
+      host_window_(NULL),
       current_paint_buf_(NULL),
       current_scroll_buf_(NULL),
       next_paint_flags_(0),
diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc
index e180328..c72c654 100644
--- a/chrome/renderer/webplugin_delegate_proxy.cc
+++ b/chrome/renderer/webplugin_delegate_proxy.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.
 
@@ -63,7 +63,7 @@ class ResourceClientProxy : public WebPluginResourceClient {
  public:
   ResourceClientProxy(PluginChannelHost* channel, int instance_id)
     : channel_(channel), instance_id_(instance_id), resource_id_(0),
-      notify_needed_(false), notify_data_(0),
+      notify_needed_(false), notify_data_(NULL),
       multibyte_response_expected_(false) {
   }
 
@@ -172,7 +172,7 @@ WebPluginDelegateProxy::WebPluginDelegateProxy(const std::string& mime_type,
     : render_view_(render_view),
       plugin_(NULL),
       windowless_(false),
-      window_(0),
+      window_(NULL),
       mime_type_(mime_type),
       clsid_(clsid),
       npobject_(NULL),
@@ -666,8 +666,8 @@ bool WebPluginDelegateProxy::BackgroundChanged(
 #else
   const unsigned char* page_bytes = cairo_image_surface_get_data(page_surface);
   int page_stride = cairo_image_surface_get_stride(page_surface);
-  int page_start_x = static_cast<int>(page_x_double);
-  int page_start_y = static_cast<int>(page_y_double);
+  int page_start_x = page_x_double;
+  int page_start_y = page_y_double;
 
   skia::PlatformDevice& device =
       background_store_canvas_->getTopPlatformDevice();
@@ -797,7 +797,7 @@ void WebPluginDelegateProxy::OnSetWindow(gfx::PluginWindowHandle window) {
 void WebPluginDelegateProxy::WillDestroyWindow() {
   DCHECK(window_);
   plugin_->WillDestroyWindow(window_);
-  window_ = 0;
+  window_ = NULL;
 }
 
 #if defined(OS_WIN)