Rollback

chrome/browser/browser_main.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.
 
 #include <windows.h>
 #include <shellapi.h>
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/histogram.h"
 #include "base/lazy_instance.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/registry.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
-#include "base/system_monitor.h"
 #include "base/tracked_objects.h"
 #include "base/win_util.h"
 #include "chrome/app/result_codes.h"
 #include "chrome/browser/automation/automation_provider.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_init.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_prefs.h"
 #include "chrome/browser/browser_process_impl.h"
 #include "chrome/browser/browser_shutdown.h"
@@ skipping 252 matching lines @@
                 sandbox::BrokerServices* broker_services) {
   // WARNING: If we get a WM_ENDSESSION objects created on the stack here
   // are NOT deleted. If you need something to run during WM_ENDSESSION add it
   // to browser_shutdown::Shutdown or BrowserProcess::EndSession.
 
   // TODO(beng, brettw): someday, break this out into sub functions with well
   //                     defined roles (e.g. pre/post-profile startup, etc).
 
   MessageLoop main_message_loop(MessageLoop::TYPE_UI);
 
-  // Initialize the SystemMonitor
-  base::SystemMonitor::Start();
-
   // Initialize statistical testing infrastructure.
   FieldTrialList field_trial;
 
   std::wstring app_name = chrome::kBrowserAppName;
   std::string thread_name_string = WideToASCII(app_name + L"_BrowserMain");
 
   const char* thread_name = thread_name_string.c_str();
   PlatformThread::SetName(thread_name);
   main_message_loop.set_thread_name(thread_name);
   bool already_running = Upgrade::IsBrowserAlreadyRunning();
@@ skipping 299 matching lines @@
   // The following should ONLY be called when in single threaded mode. It is
   // unsafe to do this cleanup if other threads are still active.
   // It is also very unnecessary, so I'm only doing this in debug to satisfy
   // purify.
   if (tracking_objects)
     tracked_objects::ThreadData::ShutdownSingleThreadedCleanup();
 #endif  // NDEBUG
 
   return result_code;
 }