Fix a ton of compiler warnings.

Most of these are classes with virtual methods lacking virtual destructors
or NULL used in non-pointer context.

BUG=none
TEST=app_unittests && base_unittests
--gtest_filter=-ConditionVariableTest.LargeFastTaskTest

patch by Jacob Mandelson <jlmjlm [at] gmail>
http://codereview.chromium.org/171028/show


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

1 files changed, 5 insertions, 6 deletions

diff --git a/base/process_util_linux.cc b/base/process_util_linux.cc
index a05e9bb..f93b359 100644
--- a/base/process_util_linux.cc
+++ b/base/process_util_linux.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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.
 
@@ -259,7 +259,6 @@ bool ProcessMetrics::GetWorkingSetKBytes(WorkingSetKBytes* ws_usage) const {
   int private_kb = 0;
   int pss_kb = 0;
   bool have_pss = false;
-  const int kPssAdjust = 0.5;
   if (!file_util::ReadFileToString(stat_file, &smaps))
     return false;
 
@@ -278,12 +277,12 @@ bool ProcessMetrics::GetWorkingSetKBytes(WorkingSetKBytes* ws_usage) const {
           return false;
         }
         if (StartsWithASCII(last_key_name, "Shared_", 1)) {
-            shared_kb += StringToInt(tokenizer.token());
+          shared_kb += StringToInt(tokenizer.token());
         } else if (StartsWithASCII(last_key_name, "Private_", 1)) {
-            private_kb += StringToInt(tokenizer.token());
+          private_kb += StringToInt(tokenizer.token());
         } else if (StartsWithASCII(last_key_name, "Pss", 1)) {
-            have_pss = true;
-            pss_kb += StringToInt(tokenizer.token()) + kPssAdjust;
+          have_pss = true;
+          pss_kb += StringToInt(tokenizer.token());
         }
         state = KEY_NAME;
         break;