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 "base/strings/utf_string_conversions.h" | 5 #include "base/strings/utf_string_conversions.h" |
6 #include "chrome/browser/chromeos/drive/file_system_util.h" | 6 #include "chrome/browser/chromeos/drive/file_system_util.h" |
7 #include "chrome/browser/chromeos/file_manager/file_manager_browsertest_base.h" | 7 #include "chrome/browser/chromeos/file_manager/file_manager_browsertest_base.h" |
8 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 8 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
9 #include "chrome/browser/signin/signin_manager_factory.h" | 9 #include "chrome/browser/signin/signin_manager_factory.h" |
10 #include "chromeos/chromeos_switches.h" | 10 #include "chromeos/chromeos_switches.h" |
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
122 "createNewFolderDownloads"), | 122 "createNewFolderDownloads"), |
123 TestParameter(NOT_IN_GUEST_MODE, | 123 TestParameter(NOT_IN_GUEST_MODE, |
124 "createNewFolderDownloads"), | 124 "createNewFolderDownloads"), |
125 TestParameter(NOT_IN_GUEST_MODE, | 125 TestParameter(NOT_IN_GUEST_MODE, |
126 "createNewFolderDrive"))); | 126 "createNewFolderDrive"))); |
127 | 127 |
128 // Fails on official build. http://crbug.com/429294 | 128 // Fails on official build. http://crbug.com/429294 |
129 #if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD) | 129 #if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD) |
130 #define MAYBE_KeyboardOperations DISABLED_KeyboardOperations | 130 #define MAYBE_KeyboardOperations DISABLED_KeyboardOperations |
131 #else | 131 #else |
132 #define MAYBE_KeyboardOperations KeyboardOperations | 132 // Flaky on other builds. http://crbug.com/512669 |
| 133 #define MAYBE_KeyboardOperations DISABLED_KeyboardOperations |
133 #endif | 134 #endif |
134 WRAPPED_INSTANTIATE_TEST_CASE_P( | 135 WRAPPED_INSTANTIATE_TEST_CASE_P( |
135 MAYBE_KeyboardOperations, | 136 MAYBE_KeyboardOperations, |
136 FileManagerBrowserTest, | 137 FileManagerBrowserTest, |
137 ::testing::Values(TestParameter(IN_GUEST_MODE, "keyboardDeleteDownloads"), | 138 ::testing::Values(TestParameter(IN_GUEST_MODE, "keyboardDeleteDownloads"), |
138 TestParameter(NOT_IN_GUEST_MODE, | 139 TestParameter(NOT_IN_GUEST_MODE, |
139 "keyboardDeleteDownloads"), | 140 "keyboardDeleteDownloads"), |
140 TestParameter(NOT_IN_GUEST_MODE, "keyboardDeleteDrive"), | 141 TestParameter(NOT_IN_GUEST_MODE, "keyboardDeleteDrive"), |
141 TestParameter(IN_GUEST_MODE, "keyboardCopyDownloads"), | 142 TestParameter(IN_GUEST_MODE, "keyboardCopyDownloads"), |
142 TestParameter(NOT_IN_GUEST_MODE, "keyboardCopyDownloads"), | 143 TestParameter(NOT_IN_GUEST_MODE, "keyboardCopyDownloads"), |
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
579 | 580 |
580 IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest, MAYBE_BasicDrive) { | 581 IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest, MAYBE_BasicDrive) { |
581 AddAllUsers(); | 582 AddAllUsers(); |
582 | 583 |
583 // Sanity check that normal operations work in multi-profile setting as well. | 584 // Sanity check that normal operations work in multi-profile setting as well. |
584 set_test_case_name("keyboardCopyDrive"); | 585 set_test_case_name("keyboardCopyDrive"); |
585 StartTest(); | 586 StartTest(); |
586 } | 587 } |
587 | 588 |
588 } // namespace file_manager | 589 } // namespace file_manager |
OLD | NEW |