| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 <stddef.h> | 5 #include <stddef.h> |
| 6 | 6 |
| 7 #include "base/macros.h" | 7 #include "base/macros.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "chrome/browser/chromeos/drive/file_system_util.h" | 9 #include "chrome/browser/chromeos/drive/file_system_util.h" |
| 10 #include "chrome/browser/chromeos/file_manager/file_manager_browsertest_base.h" | 10 #include "chrome/browser/chromeos/file_manager/file_manager_browsertest_base.h" |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 | 122 |
| 123 // Fails on official build. http://crbug.com/429294 | 123 // Fails on official build. http://crbug.com/429294 |
| 124 // Flaky: http://crbug.com/711290 | 124 // Flaky: http://crbug.com/711290 |
| 125 WRAPPED_INSTANTIATE_TEST_CASE_P( | 125 WRAPPED_INSTANTIATE_TEST_CASE_P( |
| 126 DISABLED_OpenImageFiles, | 126 DISABLED_OpenImageFiles, |
| 127 FileManagerBrowserTest, | 127 FileManagerBrowserTest, |
| 128 ::testing::Values(TestParameter(IN_GUEST_MODE, "imageOpenDownloads"), | 128 ::testing::Values(TestParameter(IN_GUEST_MODE, "imageOpenDownloads"), |
| 129 TestParameter(NOT_IN_GUEST_MODE, "imageOpenDownloads"), | 129 TestParameter(NOT_IN_GUEST_MODE, "imageOpenDownloads"), |
| 130 TestParameter(NOT_IN_GUEST_MODE, "imageOpenDrive"))); | 130 TestParameter(NOT_IN_GUEST_MODE, "imageOpenDrive"))); |
| 131 | 131 |
| 132 #if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD) | 132 // Flaky: crbug.com/715963 |
| 133 #define MAYBE_CreateNewFolder DISABLED_CreateNewFolder | |
| 134 #else | |
| 135 #define MAYBE_CreateNewFolder CreateNewFolder | |
| 136 #endif | |
| 137 WRAPPED_INSTANTIATE_TEST_CASE_P( | 133 WRAPPED_INSTANTIATE_TEST_CASE_P( |
| 138 MAYBE_CreateNewFolder, | 134 DISABLED_CreateNewFolder, |
| 139 FileManagerBrowserTest, | 135 FileManagerBrowserTest, |
| 140 ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, | 136 ::testing::Values( |
| 141 "createNewFolderAfterSelectFile"), | 137 TestParameter(NOT_IN_GUEST_MODE, "createNewFolderAfterSelectFile"), |
| 142 TestParameter(IN_GUEST_MODE, | 138 TestParameter(IN_GUEST_MODE, "createNewFolderDownloads"), |
| 143 "createNewFolderDownloads"), | 139 TestParameter(NOT_IN_GUEST_MODE, "createNewFolderDownloads"), |
| 144 TestParameter(NOT_IN_GUEST_MODE, | 140 TestParameter(NOT_IN_GUEST_MODE, "createNewFolderDrive"))); |
| 145 "createNewFolderDownloads"), | |
| 146 TestParameter(NOT_IN_GUEST_MODE, | |
| 147 "createNewFolderDrive"))); | |
| 148 | 141 |
| 149 // Fails on official build. http://crbug.com/429294 | 142 // Fails on official build. http://crbug.com/429294 |
| 150 #if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD) | 143 #if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD) |
| 151 #define MAYBE_KeyboardOperations DISABLED_KeyboardOperations | 144 #define MAYBE_KeyboardOperations DISABLED_KeyboardOperations |
| 152 #else | 145 #else |
| 153 #define MAYBE_KeyboardOperations KeyboardOperations | 146 #define MAYBE_KeyboardOperations KeyboardOperations |
| 154 #endif | 147 #endif |
| 155 WRAPPED_INSTANTIATE_TEST_CASE_P( | 148 WRAPPED_INSTANTIATE_TEST_CASE_P( |
| 156 MAYBE_KeyboardOperations, | 149 MAYBE_KeyboardOperations, |
| 157 FileManagerBrowserTest, | 150 FileManagerBrowserTest, |
| (...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 692 | 685 |
| 693 IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest, MAYBE_BasicDrive) { | 686 IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest, MAYBE_BasicDrive) { |
| 694 AddAllUsers(); | 687 AddAllUsers(); |
| 695 | 688 |
| 696 // Sanity check that normal operations work in multi-profile setting as well. | 689 // Sanity check that normal operations work in multi-profile setting as well. |
| 697 set_test_case_name("keyboardCopyDrive"); | 690 set_test_case_name("keyboardCopyDrive"); |
| 698 StartTest(); | 691 StartTest(); |
| 699 } | 692 } |
| 700 | 693 |
| 701 } // namespace file_manager | 694 } // namespace file_manager |
| OLD | NEW |