Revert 109960 - Send WM_DEVICECHANGE message through SystemMonitor

base/system_monitor/system_monitor.cc

 // 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.
 
 #include "base/system_monitor/system_monitor.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/time.h"
 
 namespace base {
 
 static SystemMonitor* g_system_monitor = NULL;
 
 #if defined(ENABLE_BATTERY_MONITORING)
 // The amount of time (in ms) to wait before running the initial
 // battery check.
 static int kDelayedBatteryCheckMs = 10 * 1000;
 #endif  // defined(ENABLE_BATTERY_MONITORING)
 
 SystemMonitor::SystemMonitor()
-    : power_observer_list_(new ObserverListThreadSafe<PowerObserver>()),
-      devices_changed_observer_list_(
-          new ObserverListThreadSafe<DevicesChangedObserver>()),
+    : observer_list_(new ObserverListThreadSafe<PowerObserver>()),
       battery_in_use_(false),
       suspended_(false) {
   DCHECK(!g_system_monitor);
   g_system_monitor = this;
 
   DCHECK(MessageLoop::current());
 #if defined(ENABLE_BATTERY_MONITORING)
   delayed_battery_check_.Start(FROM_HERE,
       base::TimeDelta::FromMilliseconds(kDelayedBatteryCheckMs), this,
       &SystemMonitor::BatteryCheck);
@@ skipping 37 matching lines @@
       break;
     case SUSPEND_EVENT:
       if (!suspended_) {
         suspended_ = true;
         NotifySuspend();
       }
       break;
   }
 }
 
-void SystemMonitor::ProcessDevicesChanged() {
-  NotifyDevicesChanged();
+void SystemMonitor::AddObserver(PowerObserver* obs) {
+  observer_list_->AddObserver(obs);
 }
 
-void SystemMonitor::AddPowerObserver(PowerObserver* obs) {
-  power_observer_list_->AddObserver(obs);
-}
-
-void SystemMonitor::RemovePowerObserver(PowerObserver* obs) {
-  power_observer_list_->RemoveObserver(obs);
-}
-
-void SystemMonitor::AddDevicesChangedObserver(DevicesChangedObserver* obs) {
-  devices_changed_observer_list_->AddObserver(obs);
-}
-
-void SystemMonitor::RemoveDevicesChangedObserver(DevicesChangedObserver* obs) {
-  devices_changed_observer_list_->RemoveObserver(obs);
-}
-
-void SystemMonitor::NotifyDevicesChanged() {
-  DVLOG(1) << "DevicesChanged";
-  devices_changed_observer_list_->Notify(
-    &DevicesChangedObserver::OnDevicesChanged);
+void SystemMonitor::RemoveObserver(PowerObserver* obs) {
+  observer_list_->RemoveObserver(obs);
 }
 
 void SystemMonitor::NotifyPowerStateChange() {
   DVLOG(1) << "PowerStateChange: " << (BatteryPower() ? "On" : "Off")
            << " battery";
-  power_observer_list_->Notify(&PowerObserver::OnPowerStateChange,
-                               BatteryPower());
+  observer_list_->Notify(&PowerObserver::OnPowerStateChange, BatteryPower());
 }
 
 void SystemMonitor::NotifySuspend() {
   DVLOG(1) << "Power Suspending";
-  power_observer_list_->Notify(&PowerObserver::OnSuspend);
+  observer_list_->Notify(&PowerObserver::OnSuspend);
 }
 
 void SystemMonitor::NotifyResume() {
   DVLOG(1) << "Power Resuming";
-  power_observer_list_->Notify(&PowerObserver::OnResume);
+  observer_list_->Notify(&PowerObserver::OnResume);
 }
 
 void SystemMonitor::BatteryCheck() {
   ProcessPowerMessage(SystemMonitor::POWER_STATE_EVENT);
 }
 
 }  // namespace base