Revert 124288 (made mac browser and ui_tests flaky) - Add Media device notification to SystemMonito…

base/system_monitor/system_monitor.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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/file_path.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
@@ skipping 59 matching lines @@
         NotifySuspend();
       }
       break;
   }
 }
 
 void SystemMonitor::ProcessDevicesChanged() {
   NotifyDevicesChanged();
 }
 
-void SystemMonitor::ProcessMediaDeviceAttached(const DeviceIdType& id,
-                                               const std::string& name,
-                                               const FilePath& path) {
-  NotifyMediaDeviceAttached(id, name, path);
-}
-
-void SystemMonitor::ProcessMediaDeviceDetached(const DeviceIdType& id) {
-  NotifyMediaDeviceDetached(id);
-}
-
 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::NotifyMediaDeviceAttached(const DeviceIdType& id,
-                                              const std::string& name,
-                                              const FilePath& path) {
-  DVLOG(1) << "MediaDeviceAttached with name " << name << " and id " << id;
-  devices_changed_observer_list_->Notify(
-    &DevicesChangedObserver::OnMediaDeviceAttached, id, name, path);
-}
-
-void SystemMonitor::NotifyMediaDeviceDetached(const DeviceIdType& id) {
-  DVLOG(1) << "MediaDeviceDetached for id " << id;
-  devices_changed_observer_list_->Notify(
-    &DevicesChangedObserver::OnMediaDeviceDetached, id);
-}
-
 void SystemMonitor::NotifyPowerStateChange() {
   DVLOG(1) << "PowerStateChange: " << (BatteryPower() ? "On" : "Off")
            << " battery";
   power_observer_list_->Notify(&PowerObserver::OnPowerStateChange,
                                BatteryPower());
 }
 
 void SystemMonitor::NotifySuspend() {
   DVLOG(1) << "Power Suspending";
   power_observer_list_->Notify(&PowerObserver::OnSuspend);
 }
 
 void SystemMonitor::NotifyResume() {
   DVLOG(1) << "Power Resuming";
   power_observer_list_->Notify(&PowerObserver::OnResume);
 }
 
 void SystemMonitor::BatteryCheck() {
   ProcessPowerMessage(SystemMonitor::POWER_STATE_EVENT);
 }
 
 }  // namespace base