| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "chrome/browser/chromeos/file_manager/file_manager_browsertest_base.h" | 5 #include "chrome/browser/chromeos/file_manager/file_manager_browsertest_base.h" |
| 6 | 6 |
| 7 namespace file_manager { | 7 namespace file_manager { |
| 8 | 8 |
| 9 template <GuestMode M> | 9 template <GuestMode M> |
| 10 class AudioPlayerBrowserTestBase : public FileManagerBrowserTestBase { | 10 class AudioPlayerBrowserTestBase : public FileManagerBrowserTestBase { |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 #define MAYBE_ChangeVolumeLevel ChangeVolumeLevel | 73 #define MAYBE_ChangeVolumeLevel ChangeVolumeLevel |
| 74 #endif | 74 #endif |
| 75 IN_PROC_BROWSER_TEST_F(AudioPlayerBrowserTest, MAYBE_ChangeVolumeLevel) { | 75 IN_PROC_BROWSER_TEST_F(AudioPlayerBrowserTest, MAYBE_ChangeVolumeLevel) { |
| 76 set_test_case_name("changeVolumeLevel"); | 76 set_test_case_name("changeVolumeLevel"); |
| 77 StartTest(); | 77 StartTest(); |
| 78 } | 78 } |
| 79 | 79 |
| 80 #if defined(MEMORY_SANITIZER) | 80 #if defined(MEMORY_SANITIZER) |
| 81 #define MAYBE_ChangeTracks DISABLED_ChangeTracks | 81 #define MAYBE_ChangeTracks DISABLED_ChangeTracks |
| 82 #else | 82 #else |
| 83 #define MAYBE_ChangeTracks ChangeTracks | 83 // Also disable because of flakyness. http://crbug.com/618198 |
| 84 #define MAYBE_ChangeTracks DISABLED_ChangeTracks |
| 84 #endif | 85 #endif |
| 85 IN_PROC_BROWSER_TEST_F(AudioPlayerBrowserTest, MAYBE_ChangeTracks) { | 86 IN_PROC_BROWSER_TEST_F(AudioPlayerBrowserTest, MAYBE_ChangeTracks) { |
| 86 set_test_case_name("changeTracks"); | 87 set_test_case_name("changeTracks"); |
| 87 StartTest(); | 88 StartTest(); |
| 88 } | 89 } |
| 89 | 90 |
| 90 } // namespace file_manager | 91 } // namespace file_manager |
| OLD | NEW |