| 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 "media/filters/pipeline_integration_test_base.h" | 5 #include "media/filters/pipeline_integration_test_base.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/strings/string_util.h" | 10 #include "base/strings/string_util.h" |
| (...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 195 KeyProvidingApp() : current_session_id_(0) {} | 195 KeyProvidingApp() : current_session_id_(0) {} |
| 196 | 196 |
| 197 virtual void OnSessionCreated(uint32 session_id, | 197 virtual void OnSessionCreated(uint32 session_id, |
| 198 const std::string& web_session_id) OVERRIDE { | 198 const std::string& web_session_id) OVERRIDE { |
| 199 EXPECT_GT(session_id, 0u); | 199 EXPECT_GT(session_id, 0u); |
| 200 EXPECT_FALSE(web_session_id.empty()); | 200 EXPECT_FALSE(web_session_id.empty()); |
| 201 } | 201 } |
| 202 | 202 |
| 203 virtual void OnSessionMessage(uint32 session_id, | 203 virtual void OnSessionMessage(uint32 session_id, |
| 204 const std::vector<uint8>& message, | 204 const std::vector<uint8>& message, |
| 205 const GURL& default_url) OVERRIDE { | 205 const GURL& destination_url) OVERRIDE { |
| 206 EXPECT_GT(session_id, 0u); | 206 EXPECT_GT(session_id, 0u); |
| 207 EXPECT_FALSE(message.empty()); | 207 EXPECT_FALSE(message.empty()); |
| 208 | 208 |
| 209 current_session_id_ = session_id; | 209 current_session_id_ = session_id; |
| 210 } | 210 } |
| 211 | 211 |
| 212 virtual void OnSessionReady(uint32 session_id) OVERRIDE { | 212 virtual void OnSessionReady(uint32 session_id) OVERRIDE { |
| 213 EXPECT_GT(session_id, 0u); | 213 EXPECT_GT(session_id, 0u); |
| 214 } | 214 } |
| 215 | 215 |
| (...skipping 1229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1445 } | 1445 } |
| 1446 | 1446 |
| 1447 // For MediaSource tests, generate two sets of tests: one using FrameProcessor, | 1447 // For MediaSource tests, generate two sets of tests: one using FrameProcessor, |
| 1448 // and one using LegacyFrameProcessor. | 1448 // and one using LegacyFrameProcessor. |
| 1449 INSTANTIATE_TEST_CASE_P(NewFrameProcessor, PipelineIntegrationTest, | 1449 INSTANTIATE_TEST_CASE_P(NewFrameProcessor, PipelineIntegrationTest, |
| 1450 Values(false)); | 1450 Values(false)); |
| 1451 INSTANTIATE_TEST_CASE_P(LegacyFrameProcessor, PipelineIntegrationTest, | 1451 INSTANTIATE_TEST_CASE_P(LegacyFrameProcessor, PipelineIntegrationTest, |
| 1452 Values(true)); | 1452 Values(true)); |
| 1453 | 1453 |
| 1454 } // namespace media | 1454 } // namespace media |
| OLD | NEW |