Revert 34994, maybe it regressed startup perf - Fix cpu/memory measurements o...

chrome/browser/safe_browsing/safe_browsing_database_unittest.cc

 // 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.
 //
 // Unit tests for the SafeBrowsing storage system.
 
 #include "base/file_util.h"
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/path_service.h"
@@ skipping 1060 matching lines @@
     FilePath full_initial_db = GetFullSBDataPath(initial_db);
     ASSERT_TRUE(file_util::CopyFile(full_initial_db, path));
   }
 
   SafeBrowsingDatabase* database = SafeBrowsingDatabase::Create();
   database->Init(path, NULL);
 
   Time before_time = Time::Now();
   base::ProcessHandle handle = base::Process::Current().handle();
   scoped_ptr<base::ProcessMetrics> metric(
-#if !defined(OS_MACOSX)
       base::ProcessMetrics::CreateProcessMetrics(handle));
-#else
-      // Getting stats only for the current process is enough, so NULL is fine.
-      base::ProcessMetrics::CreateProcessMetrics(handle, NULL));
-#endif
   CHECK(metric->GetIOCounters(&before));
 
   std::vector<SBListChunkRanges> lists;
   database->UpdateStarted();
   database->GetListsInfo(&lists);
   database->DeleteChunks(deletes);
   for (size_t i = 0; i < chunks.size(); ++i)
     database->InsertChunks(chunks[i].listname, chunks[i].chunks);
 
   database->UpdateFinished(true);
@@ skipping 154 matching lines @@
 TEST(SafeBrowsingDatabase, DISABLED_DatabaseOldLotsofDeletesIO) {
   std::vector<ChunksInfo> chunks;
   std::vector<SBChunkDelete>* deletes = new std::vector<SBChunkDelete>;
   SBChunkDelete del;
   del.is_sub_del = false;
   del.list_name = safe_browsing_util::kMalwareList;
   del.chunk_del.push_back(ChunkRange(3539, 3579));
   deletes->push_back(del);
   PeformUpdate(GetOldSafeBrowsingPath(), chunks, deletes);
 }