| 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 "net/test/embedded_test_server/embedded_test_server.h" | 10 #include "net/test/embedded_test_server/embedded_test_server.h" |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 | 52 |
| 53 private: | 53 private: |
| 54 const std::string kHiddenPath = "hidden_redirect"; | 54 const std::string kHiddenPath = "hidden_redirect"; |
| 55 }; | 55 }; |
| 56 | 56 |
| 57 IN_PROC_BROWSER_TEST_F(MediaRedirectTest, CanPlayHiddenWebm) { | 57 IN_PROC_BROWSER_TEST_F(MediaRedirectTest, CanPlayHiddenWebm) { |
| 58 RunRedirectTest("bear.webm"); | 58 RunRedirectTest("bear.webm"); |
| 59 } | 59 } |
| 60 | 60 |
| 61 #if defined(OS_ANDROID) && defined(USE_PROPRIETARY_CODECS) | 61 #if defined(OS_ANDROID) && defined(USE_PROPRIETARY_CODECS) |
| 62 IN_PROC_BROWSER_TEST_F(MediaRedirectTest, CanPlayHiddenHls) { | 62 // Flaky, see http://crbug.com/624005 |
| 63 IN_PROC_BROWSER_TEST_F(MediaRedirectTest, DISABLED_CanPlayHiddenHls) { |
| 63 RunRedirectTest("bear.m3u8"); | 64 RunRedirectTest("bear.m3u8"); |
| 64 } | 65 } |
| 65 #endif | 66 #endif |
| 66 | 67 |
| 67 } // namespace content | 68 } // namespace content |
| OLD | NEW |