| 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 <stdint.h> | 5 #include <stdint.h> |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 307 | 307 |
| 308 private: | 308 private: |
| 309 // |media_stream_manager_| needs to outlive |thread_bundle_| because it is a | 309 // |media_stream_manager_| needs to outlive |thread_bundle_| because it is a |
| 310 // MessageLoop::DestructionObserver. | 310 // MessageLoop::DestructionObserver. |
| 311 StrictMock<MockMediaStreamRequester> stream_requester_; | 311 StrictMock<MockMediaStreamRequester> stream_requester_; |
| 312 std::unique_ptr<MediaStreamManager> media_stream_manager_; | 312 std::unique_ptr<MediaStreamManager> media_stream_manager_; |
| 313 const content::TestBrowserThreadBundle thread_bundle_; | 313 const content::TestBrowserThreadBundle thread_bundle_; |
| 314 // |audio_manager_| needs to outlive |thread_bundle_| because it uses the | 314 // |audio_manager_| needs to outlive |thread_bundle_| because it uses the |
| 315 // underlying message loop. | 315 // underlying message loop. |
| 316 media::ScopedAudioManagerPtr audio_manager_; | 316 media::ScopedAudioManagerPtr audio_manager_; |
| 317 std::unique_ptr<media::AudioSystem> audio_system_; | 317 media::AudioSystem::UniquePtr audio_system_; |
| 318 content::TestBrowserContext browser_context_; | 318 content::TestBrowserContext browser_context_; |
| 319 content::TestContentBrowserClient browser_client_; | 319 content::TestContentBrowserClient browser_client_; |
| 320 const scoped_refptr<base::SingleThreadTaskRunner> task_runner_; | 320 const scoped_refptr<base::SingleThreadTaskRunner> task_runner_; |
| 321 int opened_session_id_; | 321 int opened_session_id_; |
| 322 std::string opened_device_label_; | 322 std::string opened_device_label_; |
| 323 | 323 |
| 324 std::unique_ptr<VideoCaptureHost> host_; | 324 std::unique_ptr<VideoCaptureHost> host_; |
| 325 mojo::Binding<mojom::VideoCaptureObserver> observer_binding_; | 325 mojo::Binding<mojom::VideoCaptureObserver> observer_binding_; |
| 326 | 326 |
| 327 DISALLOW_COPY_AND_ASSIGN(VideoCaptureTest); | 327 DISALLOW_COPY_AND_ASSIGN(VideoCaptureTest); |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 366 StartCapture(); | 366 StartCapture(); |
| 367 | 367 |
| 368 // When the session is closed via the stream without stopping capture, the | 368 // When the session is closed via the stream without stopping capture, the |
| 369 // ENDED event is sent. | 369 // ENDED event is sent. |
| 370 EXPECT_CALL(*this, OnStateChanged(mojom::VideoCaptureState::ENDED)); | 370 EXPECT_CALL(*this, OnStateChanged(mojom::VideoCaptureState::ENDED)); |
| 371 CloseSession(); | 371 CloseSession(); |
| 372 base::RunLoop().RunUntilIdle(); | 372 base::RunLoop().RunUntilIdle(); |
| 373 } | 373 } |
| 374 | 374 |
| 375 } // namespace content | 375 } // namespace content |
| OLD | NEW |