| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/renderer/media/user_media_client_impl.h" | 5 #include "content/renderer/media/user_media_client_impl.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 result[MEDIA_DEVICE_TYPE_VIDEO_INPUT].push_back( | 69 result[MEDIA_DEVICE_TYPE_VIDEO_INPUT].push_back( |
| 70 MediaDeviceInfo("fake_video_input 2", "Fake Video Input 2", "")); | 70 MediaDeviceInfo("fake_video_input 2", "Fake Video Input 2", "")); |
| 71 } | 71 } |
| 72 if (request_audio_output) { | 72 if (request_audio_output) { |
| 73 result[MEDIA_DEVICE_TYPE_AUDIO_OUTPUT].push_back(MediaDeviceInfo( | 73 result[MEDIA_DEVICE_TYPE_AUDIO_OUTPUT].push_back(MediaDeviceInfo( |
| 74 "fake_audio_output 1", "Fake Audio Input 1", "fake_group 1")); | 74 "fake_audio_output 1", "Fake Audio Input 1", "fake_group 1")); |
| 75 } | 75 } |
| 76 callback.Run(result); | 76 callback.Run(result); |
| 77 } | 77 } |
| 78 | 78 |
| 79 mojom::MediaDevicesDispatcherHostPtr CreateInterfacePtrAndBind() { | 79 ::mojom::MediaDevicesDispatcherHostPtr CreateInterfacePtrAndBind() { |
| 80 return binding_.CreateInterfacePtrAndBind(); | 80 return binding_.CreateInterfacePtrAndBind(); |
| 81 } | 81 } |
| 82 | 82 |
| 83 private: | 83 private: |
| 84 mojo::Binding<mojom::MediaDevicesDispatcherHost> binding_; | 84 mojo::Binding<::mojom::MediaDevicesDispatcherHost> binding_; |
| 85 }; | 85 }; |
| 86 | 86 |
| 87 class UserMediaClientImplUnderTest : public UserMediaClientImpl { | 87 class UserMediaClientImplUnderTest : public UserMediaClientImpl { |
| 88 public: | 88 public: |
| 89 enum RequestState { | 89 enum RequestState { |
| 90 REQUEST_NOT_STARTED, | 90 REQUEST_NOT_STARTED, |
| 91 REQUEST_NOT_COMPLETE, | 91 REQUEST_NOT_COMPLETE, |
| 92 REQUEST_SUCCEEDED, | 92 REQUEST_SUCCEEDED, |
| 93 REQUEST_FAILED, | 93 REQUEST_FAILED, |
| 94 }; | 94 }; |
| (...skipping 636 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 731 // Now we load a new document in the web frame. If in the above Stop() call, | 731 // Now we load a new document in the web frame. If in the above Stop() call, |
| 732 // UserMediaClientImpl accidentally removed audio track, then video track will | 732 // UserMediaClientImpl accidentally removed audio track, then video track will |
| 733 // be removed again here, which is incorrect. | 733 // be removed again here, which is incorrect. |
| 734 LoadNewDocumentInFrame(); | 734 LoadNewDocumentInFrame(); |
| 735 blink::WebHeap::collectAllGarbageForTesting(); | 735 blink::WebHeap::collectAllGarbageForTesting(); |
| 736 EXPECT_EQ(1, ms_dispatcher_->stop_video_device_counter()); | 736 EXPECT_EQ(1, ms_dispatcher_->stop_video_device_counter()); |
| 737 EXPECT_EQ(1, ms_dispatcher_->stop_audio_device_counter()); | 737 EXPECT_EQ(1, ms_dispatcher_->stop_audio_device_counter()); |
| 738 } | 738 } |
| 739 | 739 |
| 740 } // namespace content | 740 } // namespace content |
| OLD | NEW |