| 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 GalleryBrowserTestBase : public FileManagerBrowserTestBase { | 10 class GalleryBrowserTestBase : public FileManagerBrowserTestBase { |
| (...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 243 set_test_case_name("rotateImageOnDownloads"); | 243 set_test_case_name("rotateImageOnDownloads"); |
| 244 StartTest(); | 244 StartTest(); |
| 245 } | 245 } |
| 246 | 246 |
| 247 IN_PROC_BROWSER_TEST_F(GalleryBrowserTestInGuestMode, RotateImageOnDownloads) { | 247 IN_PROC_BROWSER_TEST_F(GalleryBrowserTestInGuestMode, RotateImageOnDownloads) { |
| 248 set_test_case_name("rotateImageOnDownloads"); | 248 set_test_case_name("rotateImageOnDownloads"); |
| 249 StartTest(); | 249 StartTest(); |
| 250 } | 250 } |
| 251 | 251 |
| 252 // http://crbug.com/508949 | 252 // http://crbug.com/508949 |
| 253 #if defined(MEMORY_SANITIZER) | 253 // http://crbug.com/690983 (Chrome OS debug build) |
| 254 #if defined(MEMORY_SANITIZER) || (defined(OS_CHROMEOS) && !defined(NDEBUG)) |
| 254 #define MAYBE_RotateImageOnDrive DISABLED_RotateImageOnDrive | 255 #define MAYBE_RotateImageOnDrive DISABLED_RotateImageOnDrive |
| 255 #else | 256 #else |
| 256 #define MAYBE_RotateImageOnDrive RotateImageOnDrive | 257 #define MAYBE_RotateImageOnDrive RotateImageOnDrive |
| 257 #endif | 258 #endif |
| 258 IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, MAYBE_RotateImageOnDrive) { | 259 IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, MAYBE_RotateImageOnDrive) { |
| 259 set_test_case_name("rotateImageOnDrive"); | 260 set_test_case_name("rotateImageOnDrive"); |
| 260 StartTest(); | 261 StartTest(); |
| 261 } | 262 } |
| 262 | 263 |
| 263 #if defined(DISABLE_SLOW_FILESAPP_TESTS) | 264 #if defined(DISABLE_SLOW_FILESAPP_TESTS) |
| (...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 538 #define MAYBE_StopStartSlideshowOnDrive DISABLED_StopStartSlideshowOnDrive | 539 #define MAYBE_StopStartSlideshowOnDrive DISABLED_StopStartSlideshowOnDrive |
| 539 #else | 540 #else |
| 540 #define MAYBE_StopStartSlideshowOnDrive StopStartSlideshowOnDrive | 541 #define MAYBE_StopStartSlideshowOnDrive StopStartSlideshowOnDrive |
| 541 #endif | 542 #endif |
| 542 IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, MAYBE_StopStartSlideshowOnDrive) { | 543 IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, MAYBE_StopStartSlideshowOnDrive) { |
| 543 set_test_case_name("stopStartSlideshowOnDrive"); | 544 set_test_case_name("stopStartSlideshowOnDrive"); |
| 544 StartTest(); | 545 StartTest(); |
| 545 } | 546 } |
| 546 | 547 |
| 547 } // namespace file_manager | 548 } // namespace file_manager |
| OLD | NEW |