Revert 85732 (broke build) - Move SystemMonitor to base/.

chrome/browser/browser_main.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_BROWSER_MAIN_H_
 #define CHROME_BROWSER_BROWSER_MAIN_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
 #include "base/tracked_objects.h"
 
 class BrowserThread;
 class CommandLine;
 class FieldTrialSynchronizer;
 class HighResolutionTimerManager;
 struct MainFunctionParams;
 class MessageLoop;
 class MetricsService;
 class PrefService;
 
-namespace base {
-class SystemMonitor;
-}
-
 namespace net {
 class NetworkChangeNotifier;
 }
 
+namespace ui {
+class SystemMonitor;
+}
+
 // BrowserMainParts:
 // This class contains different "stages" to be executed in |BrowserMain()|,
 // mostly initialization. This is made into a class rather than just functions
 // so each stage can create and maintain state. Each part is represented by a
 // single method (e.g., "EarlyInitialization()"), which does the following:
 //  - calls a method (e.g., "PreEarlyInitialization()") which individual
 //    platforms can override to provide platform-specific code which is to be
 //    executed before the common code;
 //  - calls various methods for things common to all platforms (for that given
 //    stage); and
@@ skipping 118 matching lines @@
   // destroyed after the main_message_loop.
   tracked_objects::AutoTracking tracking_objects_;
 #endif
 
   // Statistical testing infrastructure for the entire browser. NULL until
   // SetupMetricsAndFieldTrials is called.
   scoped_ptr<base::FieldTrialList> field_trial_list_;
 
   // Members initialized in |MainMessageLoopStart()| ---------------------------
   scoped_ptr<MessageLoop> main_message_loop_;
-  scoped_ptr<base::SystemMonitor> system_monitor_;
+  scoped_ptr<ui::SystemMonitor> system_monitor_;
   scoped_ptr<HighResolutionTimerManager> hi_res_timer_manager_;
   scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_;
   scoped_ptr<BrowserThread> main_thread_;
 
   // Initialized in SetupMetricsAndFieldTrials.
   scoped_refptr<FieldTrialSynchronizer> field_trial_synchronizer_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserMainParts);
 };
 
@@ skipping 10 matching lines @@
 
 // Displays a warning message if some minimum level of OS support is not
 // present on the current platform.
 void WarnAboutMinimumSystemRequirements();
 
 // Records the time from our process' startup to the present time in
 // the UMA histogram |metric_name|.
 void RecordBrowserStartupTime();
 
 #endif  // CHROME_BROWSER_BROWSER_MAIN_H_