| 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 "build/build_config.h" | 5 #include "build/build_config.h" |
| 6 #include "content/browser/media/media_browsertest.h" | 6 #include "content/browser/media/media_browsertest.h" |
| 7 #include "content/public/test/browser_test_utils.h" | 7 #include "content/public/test/browser_test_utils.h" |
| 8 #include "content/public/test/content_browser_test_utils.h" | 8 #include "content/public/test/content_browser_test_utils.h" |
| 9 #include "media/base/test_data_util.h" | 9 #include "media/base/test_data_util.h" |
| 10 #include "media/media_features.h" |
| 10 #include "net/test/embedded_test_server/embedded_test_server.h" | 11 #include "net/test/embedded_test_server/embedded_test_server.h" |
| 11 #include "net/test/embedded_test_server/http_request.h" | 12 #include "net/test/embedded_test_server/http_request.h" |
| 12 #include "net/test/embedded_test_server/http_response.h" | 13 #include "net/test/embedded_test_server/http_response.h" |
| 13 | 14 |
| 14 namespace content { | 15 namespace content { |
| 15 | 16 |
| 16 // Tests that WebMediaPlayer implementations choose the right playback engine | 17 // Tests that WebMediaPlayer implementations choose the right playback engine |
| 17 // for content even when the playback extension is not known upfront. | 18 // for content even when the playback extension is not known upfront. |
| 18 class MediaRedirectTest : public MediaBrowserTest { | 19 class MediaRedirectTest : public MediaBrowserTest { |
| 19 public: | 20 public: |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 } | 53 } |
| 53 | 54 |
| 54 private: | 55 private: |
| 55 const std::string kHiddenPath = "hidden_redirect"; | 56 const std::string kHiddenPath = "hidden_redirect"; |
| 56 }; | 57 }; |
| 57 | 58 |
| 58 IN_PROC_BROWSER_TEST_F(MediaRedirectTest, CanPlayHiddenWebm) { | 59 IN_PROC_BROWSER_TEST_F(MediaRedirectTest, CanPlayHiddenWebm) { |
| 59 RunRedirectTest("bear.webm"); | 60 RunRedirectTest("bear.webm"); |
| 60 } | 61 } |
| 61 | 62 |
| 62 #if defined(OS_ANDROID) && defined(USE_PROPRIETARY_CODECS) | 63 #if defined(OS_ANDROID) && BUILDFLAG(USE_PROPRIETARY_CODECS) |
| 63 // Flaky, see http://crbug.com/624005 | 64 // Flaky, see http://crbug.com/624005 |
| 64 IN_PROC_BROWSER_TEST_F(MediaRedirectTest, DISABLED_CanPlayHiddenHls) { | 65 IN_PROC_BROWSER_TEST_F(MediaRedirectTest, DISABLED_CanPlayHiddenHls) { |
| 65 RunRedirectTest("bear.m3u8"); | 66 RunRedirectTest("bear.m3u8"); |
| 66 } | 67 } |
| 67 #endif | 68 #endif |
| 68 | 69 |
| 69 } // namespace content | 70 } // namespace content |
| OLD | NEW |