| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "media/remoting/demuxer_stream_adapter.h" | 5 #include "media/remoting/demuxer_stream_adapter.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/callback_helpers.h" | 10 #include "base/callback_helpers.h" |
| 11 #include "base/message_loop/message_loop.h" |
| 11 #include "base/run_loop.h" | 12 #include "base/run_loop.h" |
| 12 #include "media/base/decoder_buffer.h" | 13 #include "media/base/decoder_buffer.h" |
| 13 #include "media/base/demuxer_stream.h" | 14 #include "media/base/demuxer_stream.h" |
| 14 #include "media/remoting/fake_media_resource.h" | 15 #include "media/remoting/fake_media_resource.h" |
| 15 #include "media/remoting/fake_remoter.h" | 16 #include "media/remoting/fake_remoter.h" |
| 16 #include "media/remoting/proto_utils.h" | 17 #include "media/remoting/proto_utils.h" |
| 17 #include "testing/gmock/include/gmock/gmock.h" | 18 #include "testing/gmock/include/gmock/gmock.h" |
| 18 #include "testing/gtest/include/gtest/gtest.h" | 19 #include "testing/gtest/include/gtest/gtest.h" |
| 19 | 20 |
| 20 using testing::_; | 21 using testing::_; |
| (...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 289 data_stream_sender_.reset(); | 290 data_stream_sender_.reset(); |
| 290 RunPendingTasks(); // Allow notification from mojo to propagate. | 291 RunPendingTasks(); // Allow notification from mojo to propagate. |
| 291 | 292 |
| 292 demuxer_stream_adapter_->TakeErrors(&errors); | 293 demuxer_stream_adapter_->TakeErrors(&errors); |
| 293 ASSERT_EQ(1u, errors.size()); | 294 ASSERT_EQ(1u, errors.size()); |
| 294 EXPECT_EQ(MOJO_PIPE_ERROR, errors[0]); | 295 EXPECT_EQ(MOJO_PIPE_ERROR, errors[0]); |
| 295 } | 296 } |
| 296 | 297 |
| 297 } // namesapce remoting | 298 } // namesapce remoting |
| 298 } // namespace media | 299 } // namespace media |
| OLD | NEW |