Remove device enumeration, caching and monitoring from MediaStreamManager.

content/browser/renderer_host/media/media_stream_manager_unittest.cc

 // Copyright (c) 2012 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 <stddef.h>
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 371 matching lines @@
     EXPECT_CALL(requester, MockDevicesChanged(_)).Times(0);
     std::string label = media_stream_manager_->EnumerateDevices(
         &requester, render_process_id, render_frame_id, kMockSalt,
         page_request_id, MEDIA_DEVICE_AUDIO_CAPTURE, security_origin);
     run_loop_enumeration.Run();
     media_stream_manager_->CancelRequest(label);
 
     // Simulate device change
     EXPECT_CALL(requester, MockDevicesChanged(_));
     audio_manager_->SetNumAudioInputDevices(3);
-    media_stream_manager_->OnDevicesChanged(base::SystemMonitor::DEVTYPE_AUDIO);
+    media_stream_manager_->media_devices_manager()->OnDevicesChanged(
+        base::SystemMonitor::DEVTYPE_AUDIO);
     run_loop_device_change.Run();
   }
 
   // Check that bogus device changes where devices have not changed
   // do not trigger a notification.
   {
     base::RunLoop run_loop;
     MockMediaStreamRequester requester(media_stream_manager_.get(), &run_loop,
                                        4, &run_loop);
     requester.SubscribeToDeviceChangeNotifications();
 
     // Bogus OnDeviceChange, as devices have not changed. Should not trigger
     // notification.
     EXPECT_CALL(requester, MockDevicesChanged(_)).Times(0);
-    media_stream_manager_->OnDevicesChanged(base::SystemMonitor::DEVTYPE_AUDIO);
+    media_stream_manager_->media_devices_manager()->OnDevicesChanged(
+        base::SystemMonitor::DEVTYPE_AUDIO);
 
     // Do enumeration to be able to quit the RunLoop.
     EXPECT_CALL(requester,
                 MockDevicesEnumerated(render_frame_id, page_request_id, _, _));
     std::string label = media_stream_manager_->EnumerateDevices(
         &requester, render_process_id, render_frame_id, kMockSalt,
         page_request_id, MEDIA_DEVICE_AUDIO_CAPTURE, security_origin);
     run_loop.Run();
     media_stream_manager_->CancelRequest(label);
   }
 }
 
 }  // namespace content