| 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 #include "chromeos/chromeos_switches.h" | 7 #include "chromeos/chromeos_switches.h" |
| 8 | 8 |
| 9 namespace file_manager { | 9 namespace file_manager { |
| 10 | 10 |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 #define MAYBE_OpenSingleVideoOnDownloads DISABLED_OpenSingleVideoOnDownloads | 47 #define MAYBE_OpenSingleVideoOnDownloads DISABLED_OpenSingleVideoOnDownloads |
| 48 #else | 48 #else |
| 49 #define MAYBE_OpenSingleVideoOnDownloads OpenSingleVideoOnDownloads | 49 #define MAYBE_OpenSingleVideoOnDownloads OpenSingleVideoOnDownloads |
| 50 #endif | 50 #endif |
| 51 IN_PROC_BROWSER_TEST_F(VideoPlayerBrowserTestInGuestMode, | 51 IN_PROC_BROWSER_TEST_F(VideoPlayerBrowserTestInGuestMode, |
| 52 MAYBE_OpenSingleVideoOnDownloads) { | 52 MAYBE_OpenSingleVideoOnDownloads) { |
| 53 set_test_case_name("openSingleVideoOnDownloads"); | 53 set_test_case_name("openSingleVideoOnDownloads"); |
| 54 StartTest(); | 54 StartTest(); |
| 55 } | 55 } |
| 56 | 56 |
| 57 // http://crbug.com/508949 | 57 // MEMORY_SANITIZER: http://crbug.com/508949 |
| 58 #if defined(MEMORY_SANITIZER) | 58 // CHROME_OS: http://crbug.com/688568 |
| 59 #if defined(MEMORY_SANITIZER) || defined(OS_CHROMEOS) |
| 59 #define MAYBE_OpenSingleVideoOnDrive DISABLED_OpenSingleVideoOnDrive | 60 #define MAYBE_OpenSingleVideoOnDrive DISABLED_OpenSingleVideoOnDrive |
| 60 #else | 61 #else |
| 61 #define MAYBE_OpenSingleVideoOnDrive OpenSingleVideoOnDrive | 62 #define MAYBE_OpenSingleVideoOnDrive OpenSingleVideoOnDrive |
| 62 #endif | 63 #endif |
| 63 IN_PROC_BROWSER_TEST_F(VideoPlayerBrowserTest, MAYBE_OpenSingleVideoOnDrive) { | 64 IN_PROC_BROWSER_TEST_F(VideoPlayerBrowserTest, MAYBE_OpenSingleVideoOnDrive) { |
| 64 set_test_case_name("openSingleVideoOnDrive"); | 65 set_test_case_name("openSingleVideoOnDrive"); |
| 65 StartTest(); | 66 StartTest(); |
| 66 } | 67 } |
| 67 | 68 |
| 68 // http://crbug.com/508949 | 69 // http://crbug.com/508949 |
| (...skipping 12 matching lines...) Expand all Loading... |
| 81 #define MAYBE_ClickControlButtons DISABLED_ClickControlButtons | 82 #define MAYBE_ClickControlButtons DISABLED_ClickControlButtons |
| 82 #else | 83 #else |
| 83 #define MAYBE_ClickControlButtons ClickControlButtons | 84 #define MAYBE_ClickControlButtons ClickControlButtons |
| 84 #endif | 85 #endif |
| 85 IN_PROC_BROWSER_TEST_F(VideoPlayerBrowserTest, MAYBE_ClickControlButtons) { | 86 IN_PROC_BROWSER_TEST_F(VideoPlayerBrowserTest, MAYBE_ClickControlButtons) { |
| 86 set_test_case_name("clickControlButtons"); | 87 set_test_case_name("clickControlButtons"); |
| 87 StartTest(); | 88 StartTest(); |
| 88 } | 89 } |
| 89 | 90 |
| 90 } // namespace file_manager | 91 } // namespace file_manager |
| OLD | NEW |