Revert "Fix a ton of compiler warnings."

base/process_util_linux.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 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.
 
 #include "base/process_util.h"
 
 #include <ctype.h>
 #include <dirent.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/wait.h>
@@ skipping 240 matching lines @@
 // Private and Shared working set sizes are obtained from /proc/<pid>/smaps,
 // as in http://www.pixelbeat.org/scripts/ps_mem.py
 bool ProcessMetrics::GetWorkingSetKBytes(WorkingSetKBytes* ws_usage) const {
   FilePath stat_file =
     FilePath("/proc").Append(IntToString(process_)).Append("smaps");
   std::string smaps;
   int shared_kb = 0;
   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;
 
   StringTokenizer tokenizer(smaps, ":\n");
   ParsingState state = KEY_NAME;
   std::string last_key_name;
   while (tokenizer.GetNext()) {
     switch (state) {
       case KEY_NAME:
         last_key_name = tokenizer.token();
         state = KEY_VALUE;
         break;
       case KEY_VALUE:
         if (last_key_name.empty()) {
           NOTREACHED();
           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());
+            have_pss = true;
+            pss_kb += StringToInt(tokenizer.token()) + kPssAdjust;
         }
         state = KEY_NAME;
         break;
     }
   }
   ws_usage->priv = private_kb;
   // Sharable is not calculated, as it does not provide interesting data.
   ws_usage->shareable = 0;
   if (have_pss) {
    ws_usage->shared = pss_kb - private_kb;
@@ skipping 37 matching lines @@
           (*io_counters).WriteTransferCount = StringToInt64(tokenizer.token());
         }
         state = KEY_NAME;
         break;
     }
   }
   return true;
 }
 
 }  // namespace base